Author: jdsn Date: Wed Apr 2 15:10:12 2008 New Revision: 45962 URL: http://svn.opensuse.org/viewcvs/yast?rev=45962&view=rev Log: renaming all registration cofiguration parameters (bnc#376000) Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registr... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/VERSION Wed Apr 2 15:10:12 2008 @@ -1 +1 @@ -2.13.20 +2.13.21 Modified: branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registr... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes Wed Apr 2 15:10:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 2 14:57:00 CEST 2008 - jdsn@suse.de + +- renaming all registration cofiguration parameters (bnc#376000) +- 2.13.21 + +------------------------------------------------------------------- Tue Apr 1 20:03:12 CEST 2008 - jdsn@suse.de - rename bootparameters for custom registration server (bnc#376000) Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registr... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp Wed Apr 2 15:10:12 2008 @@ -381,8 +381,8 @@ y2debug("submit_hwdata: %1", Register::submit_hwdata); y2debug("submit_optional: %1", Register::submit_optional); y2debug("registration_data: %1", Register::registration_data); - y2debug("smt_server: %1", Register::smt_server); - y2debug("smt_server_cert: %1", Register::smt_server_cert); + y2debug("reg_server: %1", Register::smt_server); + y2debug("reg_server_cert: %1", Register::smt_server_cert); } UI::CloseDialog(); Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registr... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc Wed Apr 2 15:10:12 2008 @@ -2,13 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -customer_center = element customer_center { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & smt_server? & smt_server_cert? } +customer_center = element customer_center { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & reg_server? & reg_server_cert? } do_registration = element do_registration { BOOLEAN } submit_hwdata = element submit_hwdata { BOOLEAN } submit_optional = element submit_optional { BOOLEAN } register_regularly = element register_regularly { BOOLEAN } -smt_server = element smt_server { text } -smt_server_cert = element smt_server_cert { text } +reg_server = element reg_server { text } +reg_server_cert = element reg_server_cert { text } registration_data = Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registr... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Wed Apr 2 15:10:12 2008 @@ -244,7 +244,7 @@ } string smtpemPath = "/etc/ssl/certs"; - string smtpemFile = smtpemPath + "/smt.pem"; + string smtpemFile = smtpemPath + "/registration-server.pem"; // check if smt_server is a valid url map smt_server_parsed = URL::Parse(smt_server); @@ -576,7 +576,7 @@ if ((symbol)uret == `trust) { string installCert = sformat("cp -a %1 %2 && c_rehash %3", certTmpFile, smtpemFile, smtpemPath); - string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/smt.cer", certTmpFile); + string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/registration-server.cer", certTmpFile); integer instret = (integer) SCR::Execute(.target.bash, installCert); integer instretZMD = (integer) SCR::Execute(.target.bash, installCertZMD); @@ -902,8 +902,8 @@ do_registration = (boolean) settings["do_registration"]:do_registration; register_regularly = (boolean) settings["register_regularly"]:register_regularly; registration_data = (map<string, string>) settings["registration_data"]:$[]; - smt_server = (string) settings["smt_server"]:""; - smt_server_cert = (string) settings["smt_server_cert"]:""; + smt_server = (string) settings["reg_server"]:""; + smt_server_cert = (string) settings["reg_server_cert"]:""; return true; } @@ -935,8 +935,8 @@ "submit_hwdata":submit_hwdata, "do_registration":do_registration, "register_regularly":register_regularly, - "smt_server":smt_server, - "smt_server_cert":smt_server_cert, + "reg_server":smt_server, + "reg_server_cert":smt_server_cert, "registration_data":registration_data ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org