Hello community, here is the log from the commit of package yast2-geo-cluster for openSUSE:Factory checked in at 2015-11-02 12:55:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-geo-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-geo-cluster" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-geo-cluster/yast2-geo-cluster.changes 2015-08-13 18:11:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new/yast2-geo-cluster.changes 2015-11-02 12:55:55.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 07:37:43 UTC 2015 - nwang@suse.com + +- BNC#952225. Polish the doc for Authentication Configuration. +- Version 3.1.11 + +------------------------------------------------------------------- @@ -4 +10 @@ -- BNC#319318. Support authentification. +- Fate#319318. Support authentification. Old: ---- yast2-geo-cluster-3.1.10.tar.bz2 New: ---- yast2-geo-cluster-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-geo-cluster.spec ++++++ --- /var/tmp/diff_new_pack.Hg79M0/_old 2015-11-02 12:55:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Hg79M0/_new 2015-11-02 12:55:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-geo-cluster -Version: 3.1.10 +Version: 3.1.11 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services ++++++ yast2-geo-cluster-3.1.10.tar.bz2 -> yast2-geo-cluster-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.changes new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.changes --- old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.changes 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.changes 2015-11-02 09:00:28.000000000 +0100 @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +Mon Nov 2 07:37:43 UTC 2015 - nwang@suse.com + +- BNC#952225. Polish the doc for Authentication Configuration. +- Version 3.1.11 + +------------------------------------------------------------------- Thu Aug 13 02:10:41 UTC 2015 - nwang@suse.com -- BNC#319318. Support authentification. +- Fate#319318. Support authentification. - Version 3.1.10 ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.spec new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.spec --- old/yast2-geo-cluster-3.1.10/package/yast2-geo-cluster.spec 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/package/yast2-geo-cluster.spec 2015-11-02 09:00:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-geo-cluster -Version: 3.1.10 +Version: 3.1.11 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/dialogs.rb new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/dialogs.rb --- old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/dialogs.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/dialogs.rb 2015-11-02 09:00:28.000000000 +0100 @@ -103,7 +103,7 @@ VBox( Right( HBox( - PushButton(Id(:authentification), _("Authentification")), + PushButton(Id(:authentication), _("Authentication")), HSpacing(2), PushButton(Id(:cancel_inner), _("Ca&ncel")), PushButton(Id(:ok), _("OK")) @@ -113,7 +113,7 @@ ) end - def authentification_layout(authfile) + def authentication_layout(authfile) VBox( VSpacing(1), CheckBoxFrame( @@ -125,25 +125,30 @@ InputField( Id(:authfilename), Opt(:hstretch), - _("Authentification file"), + _("Authentication file"), authfile ), - Label( + Left(Label( _( - "A relative path will be saved in /etc/booth, or using absolute path directly." + "The file will be written to /etc/booth." ) - ), - Label( + )), + Left(Label( + _( + "To write it to a different directory, enter an absolute path." + ) + )), + Left(Label( _( "For a newly created geo cluster, push the button below to generate /etc/booth/<key>." ) - ), - Label( + )), + Left(Label( _( - "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually." + "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually." ) - ), - PushButton(Id(:genf), Opt(:notify), _("Generate Authentification Key File")) + )), + PushButton(Id(:genf), Opt(:notify), _("Generate Authentication Key File")) ) ), VStretch(), @@ -638,9 +643,9 @@ next end - if ret == :authentification || ret == :ok && cur_page == :basic - #Validation check before switch to authentification - #Still fall to :authentification or :ok + if ret == :authentication || ret == :ok && cur_page == :basic + #Validation check before switch to authentication + #Still fall to :authentication or :ok conf = UI.QueryWidget(:confname, :Value).to_s if conf == "" Popup.Message(_("Configuration name can not be empty.")) @@ -681,13 +686,13 @@ end end - if ret == :authentification - cur_page = :authentification + if ret == :authentication + cur_page = :authentication Wizard.SetContents( - Ops.get_string(@NAME, "authentification_conf", ""), - authentification_layout(authfile), - Ops.get_string(@HELPS, "authentification", ""), + Ops.get_string(@NAME, "authentication_conf", ""), + authentication_layout(authfile), + Ops.get_string(@HELPS, "authentication", ""), false, false ) @@ -698,7 +703,7 @@ end end - if ret == :basic || ret == :ok && cur_page == :authentification + if ret == :basic || ret == :ok && cur_page == :authentication #Validation check before switch to basic #Still fall to :basic or :ok if UI.QueryWidget(Id(:secauth), :Value) @@ -730,10 +735,10 @@ path(".target.bash"), "/usr/sbin/booth-keygen " + temp_authfile ) != 0 - Popup.Message(_("Failed to create authentification file ") + temp_authfile + + Popup.Message(_("Failed to create authentication file ") + temp_authfile + "\nNeed to check the directory and remove the exist key file.") else - Popup.Message(_("Succeed to created authentification file ") + temp_authfile) + Popup.Message(_("Succeed to created authentication file ") + temp_authfile) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/helps.rb new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/helps.rb --- old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/helps.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/helps.rb 2015-11-02 09:00:28.000000000 +0100 @@ -35,15 +35,16 @@ "confs" => "<p><b>configure files</b><br> \n" + "Geo cluster support Multi confs, like /etc/booth/*.conf \n" + "<p>", - "authentification" => "<p><b>Authentification configuration</b><br> \n" + + "authentication" => "<p><b>Authentication configuration</b><br> \n" + "<b>Enable Security Auth</b><br>\n" + - "Enable/disable authentification of geo cluster of one conf.</p>" + - "<p><b>Authentification file</b><br>\n" + - "A relative path will be saved in /etc/booth, or using absolute path directly.</p>" + - "<p><b>Generate Authentification Key File</b><br>\n" + - "Auto generate authentification file. The key must be between 8 and 64 characters long and" + + "Enable/disable authentication of geo cluster of one conf.</p>" + + "<p><b>Authentication file</b><br>\n" + + "The file will be written to /etc/booth. To write it to a different directory, enter an absolute path.\n" + + "To join an existing geo cluster, please copy /etc/booth/<key> from other nodes manually.</p>" + + "<p><b>Generate Authentication Key File</b><br>\n" + + "Auto generate authentication file. The key must be between 8 and 64 characters long and" + "be readable only by the file owner. Save as /etc/booth/*.key is recommended.\n" + - "Need to sync generated authentification file to all nodes manually or via csync2." + + "Need to sync generated authentication file to all nodes manually or via csync2." + "Generation may fail when file already exist or directory not exist!" + "</p>", "booth" => "<p><b>transport</b><br> \n" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/wizards.rb new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/wizards.rb --- old/yast2-geo-cluster-3.1.10/src/include/geo-cluster/wizards.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/include/geo-cluster/wizards.rb 2015-11-02 09:00:28.000000000 +0100 @@ -44,7 +44,7 @@ @NAME = { "choose_conf" => _("Geo Cluster Configuration"), - "authentification_conf" => _("Authentification Configuration"), + "authentication_conf" => _("Authentication Configuration"), "firewall" => _("Firewall Configuration"), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-3.1.10/src/modules/GeoCluster.rb new/yast2-geo-cluster-3.1.11/src/modules/GeoCluster.rb --- old/yast2-geo-cluster-3.1.10/src/modules/GeoCluster.rb 2015-08-13 04:15:11.000000000 +0200 +++ new/yast2-geo-cluster-3.1.11/src/modules/GeoCluster.rb 2015-11-02 09:00:28.000000000 +0100 @@ -74,7 +74,7 @@ # Read all geo-cluster settings # @return true on success @global_files = {} - # Empty "authfile" means disable authentification + # Empty "authfile" means disable authentication @global_conf_single = { "transport" => "UDP", "port" => "9929", "authfile" => "" } @global_conf_list = [ "arbitrator", "site" ] @global_conf_ticket = { "expire" => "", "acquire-after" => "", "timeout" => "", "retries" => "", "weights" => "", "before-acquire-handler" => ""}