June 2011 - YaST Development - openSUSE Mailing Lists

[yast-devel] YaST Group Desktop files do not comply with FreeDesktop standards
by Lukas Ocilka 22 Jun '11

22 Jun '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I'm currently cleaning my bugzilla up and I've found this bug: Bug #470482 - YaST2 group .desktop files do not comply to FreeDesktop standard [1] which results in too much noise in .xsession-errors See https://bugzilla.novell.com/show_bug.cgi?id=470482 According to comments, YaST Group Desktop files cause many .xsession-errors because: * They contain Type="Application" * They (of course) do not contain any Exec=/some/binary There are two proposed solutions: * Add fake Exec=... line * Move the desktop files out of /usr/share/applications I don't like any of the proposed solutions much, so I'm asking *you* whether we have another option or what do you think of the proposed ones? Thanks in advance Lukas #1 http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-late… - -- Lukas Ocilka, Appliances Department, SUSE LINUX s.r.o. MD: Jeff Hawn, Jennifer Guild, Alena Hendrichova -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iD8DBQFN/whuVSqMdRCqTiwRAoSAAKCH1b+V4oOWchroTjEvOfMkfiZadwCfXJI+ aUTjg/RkTb3Qnb4ORX/lnd0= =TXCn -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

4 6

[yast-devel] Re: [yast-commit] r64465 - Y2ALLGLOBAL
by Martin Vidner 21 Jun '11

21 Jun '11

On Fri, Jun 17, 2011 at 03:28:05PM -0000, lslezak(a)svn2.opensuse.org wrote: > Author: lslezak > Date: Fri Jun 17 17:28:04 2011 > New Revision: 64465 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64465&view=rev > Log: > move Wagon::FindMountPoint() function to separate include file > > so it can be tested, added a testsuite for it TESTS, WOW! BTW it is a secret little feature of yast2-core that defining the environment variable Y2ALLGLOBAL makes all functions in a module global. It is enabled during the tests, so wagon_helpers.ycp just because of the tests is unnecessary. > > Added: > trunk/wagon/src/include/wagon_helpers.ycp > trunk/wagon/testsuite/tests/FindMountPoint.err > trunk/wagon/testsuite/tests/FindMountPoint.out > trunk/wagon/testsuite/tests/FindMountPoint.ycp > Modified: > trunk/wagon/src/modules/Makefile.am > trunk/wagon/src/modules/Wagon.ycp -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

2 1

[yast-devel] Re: [yast-commit] r64487 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: VERSION package/yast2-dns-server.changes src/dialog-main.ycp
by Martin Vidner 21 Jun '11

21 Jun '11

On Mon, Jun 20, 2011 at 01:47:39PM -0000, locilka(a)svn2.opensuse.org wrote: > Author: locilka > Date: Mon Jun 20 15:47:37 2011 > New Revision: 64487 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64487&view=rev > Log: > - Automatically changing entered forwarder to a localhost IP if > the server would forward to itself (non-local IP) (BNC #676676). > - 2.17.16 > Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-main.ycp > URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… > ============================================================================== > --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-main.ycp (original) > +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-main.ycp Mon Jun 20 15:47:37 2011 > @@ -428,6 +428,66 @@ > } > > /** > + * Returns list of IPs currently used by the system. > + * > + * @param boolean whether local addresses should be returned as well (the default is false) > + */ > +list <string> CurrentlyUsedIPs (boolean including_local) { > + string cmd = "ip addr show | grep 'inet\$6\$\\?' | sed 's/^[ \\t]\\+inet\$6\$\\?[ \\t]\\+\$[^\\/]\\+\$\\/.*$/\\2/'"; BTW the -E/--extended-regexp flag makes it easier: grep -E 'inet6?' | ... And what I learned today, sed has -r/--regexp-extended (don't you love consistent tools?) > + map cmd_ret = (map) SCR::Execute (.target.bash_output, cmd); > + > + if (cmd_ret == nil || cmd_ret["exit"]:-1 != 0) { > + y2error ("Cannot get list of used IPs: %1", cmd_ret); > + return nil; > + } > + > + list <string> used_ips = splitstring (cmd_ret["stdout"]:"", "\n"); > + used_ips = filter (string used_ip, used_ips, ``(used_ip != nil && used_ip != "")); list <string> used_ips = String::NewlineItems(cmd_ret["stdout"]:""); Everyone raise your mouse cursor if you've ever reimplemented this function ;-) > + > + // Filtering out all local IPs > + if (including_local != true) { > + used_ips = filter (string used_ip, used_ips, ``( > + !regexpmatch(used_ip, "127\.0\.0\..*") && used_ip != "::1" > + )); > + } > + > + return used_ips; > +} -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

2 1

[yast-devel] Re: [yast-commit] r64445 - in /trunk/wagon: package/yast2-wagon.changes src/Makefile.am src/clients/wagon_registration_check.ycp src/config/online_migration-SLE.xml src/config/online_migration-openSUSE.xml
by Martin Vidner 20 Jun '11

20 Jun '11

On Fri, Jun 17, 2011 at 11:49:46AM -0000, lslezak(a)svn2.opensuse.org wrote: > Author: lslezak > Date: Fri Jun 17 13:49:46 2011 > New Revision: 64445 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64445&view=rev > Log: > added a new client for checking registration status before starting migration (fate#309594) > > Added: trunk/wagon/src/clients/wagon_registration_check.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registra… > ============================================================================== > --- trunk/wagon/src/clients/wagon_registration_check.ycp (added) > +++ trunk/wagon/src/clients/wagon_registration_check.ycp Fri Jun 17 13:49:46 2011 > + define boolean OutdatedStatus(map<string,any> status) Please document the format of status. In a previous commit, I found a reference to https://wiki.innerweb.novell.com/index.php/Registration#Add_Registration_St… which is not readable publicly. Additionally, it only documents the XML format and who remembers how XML::Simple presents it in a map? It would be unmaintainable to repeat the description everywhere but I think at least each file should have reference. > + { > + // missing data, we cannot tell if it's outdated, suppose not > + if (!haskey(status, "timestamp") || status["timestamp"]:0 <= 0) > + { > + return false; > + } > + > + boolean ret = status["timestamp"]:time() + max_age < time(); > + y2milestone("Registration status is outdated: %1", ret); > + > + return ret; > + } ... especially if it is then used all over the place: > + define list<map<string,any> > UnknownProducts(map<string,any> status) > + define string RegistrationSummary(map<string,any> status) > + define void SetContent(map<string,any> status) > + define symbol RegistrationSummaryDialog(map<string,any> status) > + define boolean Interactive(map<string,any> status) -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

1 0

[yast-devel] Re: [yast-commit] r64378 - in /trunk/sshd: VERSION package/yast2-sshd.changes src/Sshd.ycp src/dialogs.ycp src/wizards.ycp
by Martin Vidner 20 Jun '11

20 Jun '11

On Wed, Jun 15, 2011 at 08:47:50AM -0000, locilka(a)svn2.opensuse.org wrote: > Author: locilka > Date: Wed Jun 15 10:47:50 2011 > New Revision: 64378 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64378&view=rev > Log: > Added possibility to manage the sshd service (#556535) > > > Modified: > trunk/sshd/VERSION > trunk/sshd/package/yast2-sshd.changes > trunk/sshd/src/Sshd.ycp > trunk/sshd/src/dialogs.ycp > trunk/sshd/src/wizards.ycp > > Modified: trunk/sshd/VERSION > URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/VERSION?rev=64378&r1=64377&… > ============================================================================== > --- trunk/sshd/VERSION (original) > +++ trunk/sshd/VERSION Wed Jun 15 10:47:50 2011 > @@ -1 +1 @@ > -2.18.0 > +2.21.0 > > Modified: trunk/sshd/package/yast2-sshd.changes > URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… > ============================================================================== > --- trunk/sshd/package/yast2-sshd.changes (original) > +++ trunk/sshd/package/yast2-sshd.changes Wed Jun 15 10:47:50 2011 > @@ -1,4 +1,10 @@ > ------------------------------------------------------------------- > +Wed Jun 15 10:45:10 CEST 2011 - locilka(a)suse.cz > + > +- Added possibility to manage the sshd service (#556535). s/#556535/bnc#556535/ > +- 2.21.0 > + > +------------------------------------------------------------------- > Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz > > - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su > > Modified: trunk/sshd/src/Sshd.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/Sshd.ycp?rev=64378&r1=6… > ============================================================================== > --- trunk/sshd/src/Sshd.ycp (original) > +++ trunk/sshd/src/Sshd.ycp Wed Jun 15 10:47:50 2011 > @@ -30,7 +30,7 @@ > /** > * Sleep time between Read or Write steps > */ > -integer sl = 200; > +integer sl = 150; WTF? > > /** > * Returns whether the configuration has been modified. > @@ -46,6 +46,40 @@ > modified = true; > } > > +string service_name = "sshd"; > + > +boolean start_service = nil; > + > +global boolean GetStartService () { > + return start_service; > +} > + > +global void SetStartService (boolean new_state) { > + if (new_state == nil) { > + y2error ("Cannot set 'StartService' to %1", new_state); > + return; > + } else if (start_service == new_state) { > + y2warning ("'StartService' unchanged"); > + return; > + } > + > + start_service = new_state; > + SetModified(); > +} > + > +/** > + * Describes whether the daemon is running > + */ > +boolean Running () { > + return (Service::Status(service_name) == 0); > +} > + > +boolean ReadStartService () { > + start_service = Running(); > + > + return (start_service != nil); > +} > + > /** > * map of SSHD settings > */ > @@ -129,26 +163,6 @@ > } > > /** > - * Describes whether the daemon is running > - */ > -boolean sshd_is_running = false; > - > -/** > - * Reads current sshd status > - */ > -boolean ReadSSHDService () { > - if (Service::Status("sshd") == 0) { > - sshd_is_running = true; > - } else { > - sshd_is_running = false; > - } > - > - y2milestone((sshd_is_running ? "SSH is running":"SSH is not running")); > - > - return true; > -} > - > -/** > * Exports the current configuration. > * > * @return map of a current configuration > @@ -161,7 +175,7 @@ > global map Export () { > return $[ > "config" : SETTINGS, > - "status" : sshd_is_running, > + "status" : Running(), > ]; > } > > @@ -170,29 +184,13 @@ > */ > global boolean Import (map import_map) { > SETTINGS = (map <string, list<string> >) import_map["config"]:$[]; > - sshd_is_running = (import_map["status"]:false == true); > + SetStartService (import_map["status"]:false == true); > SetModified(); > y2milestone ("Configuration has been imported"); > return true; > } > > /** > - * Restarts the sshd when the daemon was running when starting the configuration > - */ > -boolean WriteSSHDService () { > - boolean all_ok = true; > - > - if (sshd_is_running) { > - y2milestone("Restarting sshd daemon"); > - all_ok = Service::Restart("sshd"); > - } else { > - y2milestone("Sshd is not running - leaving..."); > - } > - > - return all_ok; > -} > - > -/** > Returns a confirmation popup dialog whether user wants to really abort. > */ > global boolean Abort() { > @@ -225,7 +223,7 @@ > /* SSHD read dialog caption */ > string caption = _("Initializing the SSHD Configuration"); > > - integer steps = 3; > + integer steps = 4; aaah, so "integer sl = 600 / steps" above, right? 8-] This Progress stuff is so... er... useful? > > Progress::New( caption, " ", steps, [ > /* Progress stage 1 */ > @@ -233,15 +231,18 @@ > /* Progress stage 2 */ > _("Read the current SSHD state"), > /* Progress stage 3 */ > - _("Read firewall settings") > + _("Read firewall settings"), > + /* Progress stage 4 */ > + _("Read service status"), > ], [ > /* Progress step 1 */ > _("Reading the current SSHD configuration..."), > /* Progress step 2 */ > - _("Reading the current SSHD state..."), > + _("Reading the current SSHD state"), > /* Progress step 3 */ > _("Reading firewall settings..."), > - /* Progress finished */ > + /* Progress step 4 */ > + _("Reading service status..."), > Message::Finished() > ], > "" > @@ -251,14 +252,12 @@ > > if (PollAbort()) return false; > Progress::NextStage(); > - /* Error message */ > if(!ReadSSHDSettings()) Report::Error(Message::CannotReadCurrentSettings()); > sleep(sl); > > if (PollAbort()) return false; > - Progress::NextStep(); > - /* Error message */ > - if(!ReadSSHDService()) Report::Error(_("Cannot read the current SSHD state.")); > + Progress::NextStage(); > + if (!ReadStartService()) Report::Error(Message::CannotReadCurrentSettings()); > sleep(sl); > > if (PollAbort()) return false; > @@ -273,10 +272,61 @@ > Progress::NextStage (); > sleep(sl); > > + if (PollAbort()) return false; > + Progress::NextStage (); > + start_service = Service::Enabled (service_name); > + sleep(sl); > + > modified = false; > return true; > } > > +boolean AdjustSSHDService () { > + boolean enable_and_start = GetStartService(); > + boolean enabled = Service::Enabled (service_name); > + boolean running = (Service::Status (service_name) == 0); > + > + if (enable_and_start == nil) { > + y2error ("Configuration error: Cannot start/stop service %1", service_name); > + return false; > + } > + > + // Service enable/disable > + if (enable_and_start == enabled) { > + y2milestone ("Service '%1' is already in the desired state", service_name); > + } else { > + if (enable_and_start && !Service::Enable (service_name)) { > + y2error ("Cannot enable service %1", service_name); > + return false; > + } else if (!enable_and_start && !Service::Disable (service_name)) { > + y2error ("Cannot disable service %1", service_name); > + return false; > + } > + } > + > + // Start / restart service > + if (enable_and_start) { > + if (Running()) { > + if (!Service::Restart(service_name)) { > + y2error ("Cannot restart service %1", service_name); > + return false; > + } > + } else { > + if (!Service::Start (service_name)) { > + y2error ("Cannot start service %1", service_name); > + return false; > + } > + } > + // Stop a running service > + } else if (Running()) { > + if (!Service::Stop (service_name)) { > + return false; > + } > + } > + > + return true; > +} > + > /** > * Write all SSHD settings > * @return true on success > @@ -286,22 +336,22 @@ > /* SSHD read dialog caption */ > string caption = _("Saving the SSHD Configuration"); > > - integer steps = 3; > - > + integer steps = 4; > + > Progress::New(caption, " ", steps, [ > /* Progress stage 1 */ > _("Write the SSHD settings"), > /* Progress stage 2 */ > - _("Adjust the SSHD service"), > + _("Write firewall settings"), > /* Progress stage 3 */ > - _("Write firewall settings") > + _("Adjust SSHD service"), > ], [ > /* Progress step 1 */ > _("Writing the SSHD settings..."), > /* Progress step 2 */ > - _("Adjusting the SSHD service..."), > - /* Progress step 3 */ > _("Writing firewall settings..."), > + /* Progress step 3 */ > + _("Adjusting SSHD service..."), > Message::Finished() > ], > "" > @@ -317,16 +367,15 @@ > > if(PollAbort()) return false; > Progress::NextStage (); > + boolean progress_state = Progress::set (false); > /* Error message */ > - if(!WriteSSHDService()) Report::Error (Message::CannotAdjustService("sshd")); > + if(!SuSEFirewall::Write()) Report::Error(_("Cannot write firewall settings.")); > + Progress::set (progress_state); > sleep(sl); > > if(PollAbort()) return false; > Progress::NextStage (); > - boolean progress_state = Progress::set (false); > - /* Error message */ > - if(!SuSEFirewall::Write()) Report::Error(_("Cannot write firewall settings.")); > - Progress::set (progress_state); > + AdjustSSHDService(); > sleep(sl); > > Progress::NextStage (); > > Modified: trunk/sshd/src/dialogs.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/dialogs.ycp?rev=64378&r… > ============================================================================== > --- trunk/sshd/src/dialogs.ycp (original) > +++ trunk/sshd/src/dialogs.ycp Wed Jun 15 10:47:50 2011 > @@ -28,6 +28,15 @@ > mbox_y = 0; > } > > +term ServiceConfigurationDialogContent () { > + return `VBox ( > + "start_stop", > + `VSpacing(1), > + "auto_start_up", > + `VStretch() > + ); > +} > + > term ServerConfigurationDialogContent () { > return `VBox ( > `Left(`Label(_("SSHD TCP Ports"))), > @@ -45,7 +54,7 @@ > /* a push button */ > `PushButton(`id("delete_port"), _("&Delete")) > )), > - `VSpacing(1), > + `VSpacing (1), > `Frame ( > /* a dialog frame caption */ > _("Server Features"), > > Modified: trunk/sshd/src/wizards.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/wizards.ycp?rev=64378&r… > ============================================================================== > --- trunk/sshd/src/wizards.ycp (original) > +++ trunk/sshd/src/wizards.ycp Wed Jun 15 10:47:50 2011 > @@ -14,10 +14,20 @@ > import "CWM"; > import "CWMTab"; > import "CWMFirewallInterfaces"; > +import "CWMServiceStart"; > +import "Sshd"; > > include "sshd/complex.ycp"; > include "sshd/dialogs.ycp"; > > +void SaveAndRestart () { > + Wizard::CreateDialog (); > + Wizard::RestoreHelp (HELPS["write"]:""); > + Sshd::Write (); > + sleep (1000); > + UI::CloseDialog (); > +} > + > /** > * Main workflow of the sshd configuration > * @return sequence result > @@ -52,9 +62,49 @@ > "services" : [ "service:sshd" ], > "display_details" : true, > ]), > + "start_stop" : CWMServiceStart::CreateStartStopWidget ($[ > + "service_id" : "sshd", > + // label - service status, informative text > + "service_running_label" : _("SSH server is running"), > + // label - service status, informative text > + "service_not_running_label" : _("SSH server is not running"), > + // push button (SSH service handling) > + "start_now_button" : _("&Start SSH Server Now"), > + // push button (SSH service handling) > + "stop_now_button" : _("S&top SSH Server Now"), > + "save_now_action" : SaveAndRestart, > + // push button (SSH service handling) > + "save_now_button" : _("Save Settings and Reload SSH Server &Now"), > + "help" : sformat (CWMServiceStart::StartStopHelpTemplate (true), > + // part of help text, used to describe pusbuttons (matching SSH service handling but without "&") > + _("Start SSH Server Now"), > + // part of help text, used to describe pusbuttons (matching SSH service handling but without "&") > + _("Stop SSH Server Now"), > + // part of help text, used to describe pusbuttons (matching SSH service handling but without "&") > + _("Save Settings and Reload SSH Server Now")), > + ]), > + "auto_start_up" : CWMServiceStart::CreateAutoStartWidget ($[ > + "get_service_auto_start" : Sshd::GetStartService, > + "set_service_auto_start" : Sshd::SetStartService, > + // radio button (starting SSH service - option 1) > + "start_auto_button" : _("Now and When &Booting"), > + // radio button (starting SSH service - option 2) > + "start_manual_button" : _("&Manually"), > + "help" : sformat (CWMServiceStart::AutoStartHelpTemplate (), > + // part of help text, used to describe radiobuttons (matching starting SSH service but without "&") > + _("Now and When Booting"), > + // part of help text, used to describe radiobuttons (matching starting SSH service but without "&") > + _("Manually") > + ), > + ]), Hmm, when I saw 'import "CWMServiceStart"' above, I thought "good, that will save us so much repetitive code" :-/ Overall... God, so much code for a stupid totally standard sysvinit service?! I want a simple declaration to replace this *entire* patch: service :name => _("SSH Server"), :sysvinit => "sshd" We really should make better libraries. > ]; > > map <string, any> tabs = $[ > + "service_configuration" : $[ > + "header" : _("&Start-Up"), > + "widget_names" : ["start_stop", "auto_start_up"], > + "contents" : ServiceConfigurationDialogContent(), > + ], > "server_configuration" : $[ > "header" : _("&General"), > "widget_names" : ["sc", "fw"], > @@ -74,7 +124,7 @@ > > map <string, any> wd = $[ > "tab" : CWMTab::CreateWidget ($[ > - "tab_order" : ["server_configuration", "login_settings", "proto_and_cipher"], > + "tab_order" : ["service_configuration", "server_configuration", "login_settings", "proto_and_cipher"], > "tabs" : tabs, > "widget_descr" : widgets, > "initial_tab" : "server_configuration", > > -- > To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org > For additional commands, e-mail: yast-commit+help(a)opensuse.org > -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

2 1

[yast-devel] Re: [yast-commit] r64422 - in /trunk/yast2/library/network: src/SuSEFirewallExpertRules.ycp testsuite/tests/SuSEFirewallExpertRules.out testsuite/tests/SuSEFirewallExpertRules.ycp
by Martin Vidner 17 Jun '11

17 Jun '11

On Thu, Jun 16, 2011 at 01:09:58PM -0000, locilka(a)svn2.opensuse.org wrote: > Author: locilka > Date: Thu Jun 16 15:09:58 2011 > New Revision: 64422 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64422&view=rev > Log: > A better fix for my previous commit (stricter/correct validation) Wow! That is a sign that having tests does help. > Modified: > trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp > trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out > trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp > > Modified: trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… > ============================================================================== > --- trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original) > +++ trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp Thu Jun 16 15:09:58 2011 > @@ -83,7 +83,7 @@ > // A.B.C.D/1 - A.B.C.D/32 (IP with a numeric netmask) > else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]+$")) { > string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]+$", "\\1"); > - string part_bits = regexpsub (network, "^" + type_ip4 + "/([01234567890])+$", "\\1"); > + string part_bits = regexpsub (network, "^" + type_ip4 + "/([01234567890]+)$", "\\1"); BTW there is still 0 twice. Next time use [0-9] which is safe (unlike [a-z]). > > return (IP::Check4(part_ip) && ValidNetmaskBits(tointeger(part_bits))); > } > > Modified: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out > URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… > ============================================================================== > --- trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out (original) > +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out Thu Jun 16 15:09:58 2011 > @@ -6,8 +6,11 @@ > Return true > Return true > Return true > +Return true > Dump All these should be *invalid* (false): > Return false > Return false > Return false > +Return false > +Return false > Dump == Done == > > Modified: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… > ============================================================================== > --- trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp (original) > +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp Thu Jun 16 15:09:58 2011 > @@ -9,11 +9,12 @@ > > list <string> valid_network_definitions = [ > "192.168.0.1", "192.168.0.0/24", "192.168.0.1/32", "192.168.0.0/255.255.0.0", > - "192.168.0.0/255.255.224.0", "0/0", > + "192.168.0.0/255.255.224.0", "0/0", "192.168.0.1/16", > ]; > > list <string> invalid_network_definitions = [ > "192.168.0.355", "192.168.0.1/0", "192.168.0.0/255.255.333.0", > + "192.168.0.1/888", "192.168.0.1/33", > ]; > > DUMP("All these should be *valid* (true):"); > > -- > To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org > For additional commands, e-mail: yast-commit+help(a)opensuse.org > -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

1 0

[yast-devel] Re: [yast-commit] r64419 - in /trunk/yast2: ./ library/network/src/ library/network/testsuite/tests/ package/
by Lukas Ocilka 16 Jun '11

16 Jun '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dne 16.6.2011 14:58, locilka(a)svn2.opensuse.org napsal(a): > Author: locilka > Date: Thu Jun 16 14:58:44 2011 > New Revision: 64419 > > Modified: trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… > ============================================================================== > --- trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original) > +++ trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp Thu Jun 16 14:58:44 2011 > @@ -83,7 +83,7 @@ > // A.B.C.D/1 - A.B.C.D/32 (IP with a numeric netmask) > else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]+$")) { > string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]+$", "\\1"); > - string part_bits = regexpsub (network, "^" + type_ip4 + "(/[01234567890])+$", "\\1"); > + string part_bits = regexpsub (network, "^" + type_ip4 + "/([01234567890])+$", "\\1"); Ouch :) regexpsub (network, "^" + type_ip4 + "/([01234567890])+$", "\\1") should be regexpsub (network, "^" + type_ip4 + "/([01234567890]+)$", "\\1"); although it passes the tests - -- Lukas Ocilka, Appliances Department, SUSE LINUX s.r.o. MD: Jeff Hawn, Jennifer Guild, Alena Hendrichova -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iD8DBQFN+f8PVSqMdRCqTiwRAibZAJoDu33xLMb93n/Zw2cqOqrOhrS64wCfXZu8 nttdeTSNJzM+FfIVYfFMU3E= =iuE+ -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

1 0

[yast-devel] Re: [yast-commit] r64348 - in /trunk/ca-management: ./ VERSION package/yast2-ca-management.changes src/CaMgm.ycp src/ca_mgm_proposal.ycp src/ca_select_proposal.ycp src/new_cert_read_write.ycp
by Martin Vidner 16 Jun '11

16 Jun '11

On Tue, Jun 14, 2011 at 12:53:18PM -0000, jreidinger(a)svn2.opensuse.org wrote: > Author: jreidinger > Date: Tue Jun 14 14:53:17 2011 > New Revision: 64348 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64348&view=rev > Log: > merge SP1 features to ca management > > Modified: > trunk/ca-management/ (props changed) > trunk/ca-management/VERSION > trunk/ca-management/package/yast2-ca-management.changes > trunk/ca-management/src/CaMgm.ycp > trunk/ca-management/src/ca_mgm_proposal.ycp > trunk/ca-management/src/ca_select_proposal.ycp > trunk/ca-management/src/new_cert_read_write.ycp > > Modified: trunk/ca-management/VERSION > URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=64348&… > ============================================================================== > --- trunk/ca-management/VERSION (original) > +++ trunk/ca-management/VERSION Tue Jun 14 14:53:17 2011 > @@ -1 +1 @@ > -2.21.0 > +2.21.1 > > Modified: trunk/ca-management/package/yast2-ca-management.changes > URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… > ============================================================================== > --- trunk/ca-management/package/yast2-ca-management.changes (original) > +++ trunk/ca-management/package/yast2-ca-management.changes Tue Jun 14 14:53:17 2011 > @@ -1,4 +1,12 @@ > ------------------------------------------------------------------- > +Tue Jun 14 13:02:34 CEST 2011 - jreidinger(a)suse.cz > + > +- version 2.21.1 > +- country selection combobox is editable to allow choose of choosing > + countries not listed there (FATE#310179) > +- allow to change altarnative name in CA proposal (FATE#308423) alternative > + > +------------------------------------------------------------------- > Fri Apr 29 11:32:34 CEST 2011 - mc(a)suse.de > > - version 2.21.0 > > Modified: trunk/ca-management/src/CaMgm.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/CaMgm.ycp?rev=… > ============================================================================== > --- trunk/ca-management/src/CaMgm.ycp (original) > +++ trunk/ca-management/src/CaMgm.ycp Tue Jun 14 14:53:17 2011 > @@ -136,6 +136,7 @@ > global symbol prop_selection = `def; // `none, `disk > > global list<map> prop_subject_alt_name_list = []; > +global boolean prop_adv_cri_issuer_alt_name = false; bbrvtns! i lv bbrvtns! f ths s prt f xstng cnvntn (*sgh*) , plz dd cmmnt, lk: // property: advanced criminal issuer altimeter name > > global boolean adv_subject_alt_name_show_email = false; > > > Modified: trunk/ca-management/src/ca_mgm_proposal.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposa… > ============================================================================== > --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) > +++ trunk/ca-management/src/ca_mgm_proposal.ycp Tue Jun 14 14:53:17 2011 > @@ -54,18 +54,20 @@ > > map<string,string> host_ips = getHostIPs (); > string hostname_bak = ""; > - CaMgm::prop_subject_alt_name_list = []; > + if (size(CaMgm::prop_subject_alt_name_list) <= 0){ > + CaMgm::prop_subject_alt_name_list = []; > > - foreach(string key, string value, host_ips, { > - if(value == "DNS") > - { > - hostname_bak = key; > - } > - map elem = $[]; > - elem["kind"] = value; > - elem["name"] = key; > - CaMgm::prop_subject_alt_name_list = add (CaMgm::prop_subject_alt_name_list, elem); > - }); > + foreach(string key, string value, host_ips, { > + if(value == "DNS") > + { > + hostname_bak = key; > + } > + map elem = $[]; > + elem["kind"] = value; > + elem["name"] = key; > + CaMgm::prop_subject_alt_name_list = add (CaMgm::prop_subject_alt_name_list, elem); > + }); > + } Thanks for fixing the indentation. Could you please make such fixes in separate commits, it makes reviewing easier. > > map retmap = (map) SCR::Execute (.target.bash_output, > "/bin/hostname --long", > > Modified: trunk/ca-management/src/ca_select_proposal.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_select_prop… > ============================================================================== > --- trunk/ca-management/src/ca_select_proposal.ycp (original) > +++ trunk/ca-management/src/ca_select_proposal.ycp Tue Jun 14 14:53:17 2011 > @@ -49,6 +49,151 @@ > }); > return result; > } > + > + define list editAltNames( list<map> initial_set ){ > + term alt_dialog = `HBox( `VSpacing(10), > + `VBox (`HSpacing(10), > + `RadioButtonGroup(`id(`rb), > + `HBox( > + `RadioButton(`id("URI"), `opt(`notify), "URI", true), > + `RadioButton(`id("email"), `opt(`notify), "email"), > + `RadioButton(`id("DNS"), `opt(`notify), "DNS"), > + `RadioButton(`id("IP"), `opt(`notify), "IP"), > + `RadioButton(`id("RID"), `opt(`notify), "RID"), > + `RadioButton(`id("MS-UPN"), `opt(`notify), "MS-UPN"), > + `RadioButton(`id("K5PN"), `opt(`notify), "K5PN") > + )), > + `TextEntry(`id(`name), _("&Name:")), labels should not have trailing colons > + // push button label > + `HBox(`PushButton (`id(`cancel), `opt(`key_F9), Label::CancelButton()), > + `HStretch(), > + `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()) > + ), > + `HSpacing(10) > + ), > + `VSpacing(10) > + ); > + UI::OpenDialog ( > + `VBox ( `Left (`CheckBox(`id(`id_adv_cri_subject_alt_name), > + _("critical"), "critical" what? Add a comment for translators so that they know whether it is "kritický" (certifikát) or "kritická" (chyba) or "kritické" (čtení kódu) > + CaMgm::prop_adv_cri_issuer_alt_name > + )), > + `VSpacing(1.5), > + `HBox( > + `VSpacing(5), > + `HWeight (3, `Table (`id (`id_adv_subject_alt_name), > + `header ( > + // To translators: table headers > + _("Kind"), > + _("Name") > + ) > + )), > + `HWeight (1, `VBox( > + `HBox ( `HWeight (1,`PushButton (`id (`add), > + `opt (`key_F3), > + Label::AddButton() > + ))), > + `HBox ( `HWeight (1,`PushButton (`id (`edit), > + `opt (`key_F3), > + Label::EditButton() > + ))), > + `HBox ( `HWeight (1,`PushButton (`id (`delete), > + `opt (`key_F5), > + Label::DeleteButton() > + ))), > + `VStretch() > + ))), > + `VSpacing(1.5), > + `ButtonBox(`PushButton(`id(`ok),`opt(`key_F10),Label::OKButton()), > + `PushButton (`id(`cancel),`opt(`key_F9,`default), Label::CancelButton()) > + ) > + )); > + any ret = nil; > + do { > + integer i = 0; > + list<term> table_list = maplist( map element, initial_set, ``{ > + i = i + 1; > + return `item (`id (i), element["kind"]:"", element["name"]:"" ); > + }); > + UI::ChangeWidget(`id(`id_adv_subject_alt_name), `Items, table_list); > + ret = UI::UserInput(); > + if (ret == `add || ret == `edit ){ > + string current_kind = ""; > + string current_name = ""; > + if (ret == `edit){ > + integer current_item = (integer)UI::QueryWidget(`id(`id_adv_subject_alt_name), `CurrentItem); > + term table_item = (term) UI::QueryWidget(`id(`id_adv_subject_alt_name), `Item(current_item)); > + if (table_item == nil) > + { > + Popup::Error (_("No item has been selected.")); > + continue; > + } > + > + current_kind = (string) table_item[1]:""; > + current_name = (string) table_item[2]:""; > + } > + UI::OpenDialog (`opt(`decorated ),alt_dialog); > + UI::SetFocus (`id(`ok)); > + if (ret == `edit){ > + UI::ChangeWidget(`id(`name), `Value, current_name); > + UI::ChangeWidget(`id(`rb), `CurrentButton, current_kind); > + } > + if(!CaMgm::adv_subject_alt_name_show_email) > + { > + UI::ChangeWidget(`id("email"), `Enabled, false); > + } else { > + UI::ChangeWidget(`id("email"), `Enabled, true); > + } > + while (true) > + { > + any ret2 = UI::UserInput(); > + if (ret2 == `ok) > + { > + map new_entry = (ret==`add) ? $[] : > + find(map m,initial_set, > + ``{return (m["kind"]:"" == current_kind && m["name"]:"" == current_name);}); > + new_entry["kind"] = (string) UI::QueryWidget(`id(`rb), `CurrentButton); > + new_entry["name"] = (string) UI::QueryWidget(`id(`name), `Value); > + if (ret == `add) > + { > + initial_set = add (initial_set, new_entry); > + } > + break; > + } > + else if (ret2 == `cancel) > + { > + break; > + } > + } > + UI::CloseDialog (); > + } else if (ret == `delete) { > + integer current_item = (integer)UI::QueryWidget(`id(`id_adv_subject_alt_name), `CurrentItem); > + term table_item = (term) UI::QueryWidget(`id(`id_adv_subject_alt_name), `Item(current_item)); > + > + if (table_item == nil) > + { > + Popup::Error (_("No item has been selected.")); > + continue; > + } > + string current_kind = (string) table_item[1]:""; > + string current_name = (string) table_item[2]:""; Actually 'foo[index]:default' already includes casting the result to the type of 'default', so (string) is superfluous here. > + > + if (Popup::YesNoHeadline ( > + // To translators: ContinueCancel Popup headline > + _("Delete"), > + // To translators: ContinueCancel Popup > + _("Really delete this entry?"))) > + { > + initial_set = filter( map element, initial_set, ``{ > + return (element["kind"]:"" != current_kind || element["name"]:"" != current_name ); > + }); > + } > + } > + } while ( ret != `ok && ret != `cancel ); ^^^ yuck. do we have a plan how to improve this "best UI practice"? > + boolean ca_crit = (boolean) UI::QueryWidget(`id(`id_adv_cri_subject_alt_name), `Value); > + UI::CloseDialog(); > + return (ret == `ok) ? [initial_set,ca_crit] : nil; > + } > > > /** > @@ -97,7 +242,7 @@ > ), > `HBox(`HWeight (1,`TextEntry(`id(`email), _("E-Mail"), CaMgm::prop_email)), > `HSpacing(2), > - `HWeight (1,`Empty()) > + `HWeight (1,`PushButton(`id(`alt),"&Edit Alternative Names")) > ) > ); > > @@ -119,12 +264,21 @@ > // Get the user input. > // > any ret = nil; > + list<map> temp_alt_names = CaMgm::prop_subject_alt_name_list; > + boolean temp_cri_alt = CaMgm::prop_adv_cri_issuer_alt_name; > > repeat > { > ret = Wizard::UserInput(); > > - if (ret == `next > + if (ret == `alt) > + { > + any ret = editAltNames(temp_alt_names); hey! how about "list names_and_criminalsorwhatever = ..." ? > + if (ret != nil) > + temp_alt_names = ((list)ret)[0]:temp_alt_names; > + temp_cri_alt = ((list)ret)[1]:temp_cri_alt; > + } > + else if (ret == `next > ||ret == `back) > { > confirmPassword = (string) UI::QueryWidget(`id(`pw2), `Value); > @@ -183,6 +337,9 @@ > CaMgm::prop_organisationUnit = (string) UI::QueryWidget(`id(`id_organisationUnit), `Value); > CaMgm::prop_locality = (string) UI::QueryWidget(`id(`id_locality), `Value); > CaMgm::prop_state = (string) UI::QueryWidget(`id(`id_state), `Value); > + CaMgm::prop_subject_alt_name_list = temp_alt_names; > + CaMgm::prop_adv_cri_issuer_alt_name = temp_cri_alt; > + y2milestone("alt names %1", CaMgm::prop_subject_alt_name_list); > } > } > } > > Modified: trunk/ca-management/src/new_cert_read_write.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_read_… > ============================================================================== > --- trunk/ca-management/src/new_cert_read_write.ycp (original) > +++ trunk/ca-management/src/new_cert_read_write.ycp Tue Jun 14 14:53:17 2011 > @@ -760,6 +760,7 @@ > foreach(map elem, CaMgm::prop_subject_alt_name_list, { > CaMgm::adv_subject_alt_name_list = add (CaMgm::adv_subject_alt_name_list, elem); > }); > + CaMgm::adv_cri_issuer_alt_name = CaMgm::prop_adv_cri_issuer_alt_name; > } > if (kind == "Client Certificate") > { > > -- > To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org > For additional commands, e-mail: yast-commit+help(a)opensuse.org > -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

3 2

[yast-devel] Re: [yast-commit] r64372 - /trunk/cluster/src/Cluster.ycp
by Martin Vidner 15 Jun '11

15 Jun '11

On Wed, Jun 15, 2011 at 03:23:29AM -0000, xwhu(a)svn2.opensuse.org wrote: > Author: xwhu > Date: Wed Jun 15 05:23:29 2011 > New Revision: 64372 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64372&view=rev > Log: > Fix quoting issues > > Modified: > trunk/cluster/src/Cluster.ycp > > Modified: trunk/cluster/src/Cluster.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/Cluster.ycp?rev=6437… > ============================================================================== > --- trunk/cluster/src/Cluster.ycp (original) > +++ trunk/cluster/src/Cluster.ycp Wed Jun 15 05:23:29 2011 > @@ -438,10 +438,10 @@ > sleep(sl); > > if (corokey != "") { > - map out = (map)SCR::Execute(.target.bash_output, "echo " + corokey + " | uudecode -o /etc/corosync/authkey"); > + map out = (map)SCR::Execute(.target.bash_output, "echo '" + corokey + "' | uudecode -o /etc/corosync/authkey"); if corokey can include apostrophes, then use: "echo '" + String::Quote(corokey) + "' |..." > } > if (csync2key != "") { > - map out = (map)SCR::Execute(.target.bash_output, "echo " + csync2key + " | uudecode -o /etc/corosync/authkey"); > + map out = (map)SCR::Execute(.target.bash_output, "echo '" + csync2key + "' | uudecode -o /etc/corosync/authkey"); > } > if (global_startopenais == true) { > SCR::Execute(.target.bash_output, "/sbin/chkconfig openais on"); > > -- > To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org > For additional commands, e-mail: yast-commit+help(a)opensuse.org > -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

1 0

[yast-devel] Re: [yast-commit] r64362 - in /trunk/cluster: agents/Makefile.am src/Cluster.ycp src/common.ycp src/dialogs.ycp src/helps.ycp src/wizards.ycp
by Martin Vidner 15 Jun '11

15 Jun '11

On Wed, Jun 15, 2011 at 03:14:11AM -0000, xwhu(a)svn2.opensuse.org wrote: > Author: xwhu > Date: Wed Jun 15 05:14:10 2011 > New Revision: 64362 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64362&view=rev > Log: > Add support of csync2 > > Modified: > trunk/cluster/agents/Makefile.am > trunk/cluster/src/Cluster.ycp > trunk/cluster/src/common.ycp > trunk/cluster/src/dialogs.ycp > trunk/cluster/src/helps.ycp > trunk/cluster/src/wizards.ycp > > Modified: trunk/cluster/agents/Makefile.am > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/agents/Makefile.am?rev=6… > ============================================================================== > --- trunk/cluster/agents/Makefile.am (original) > +++ trunk/cluster/agents/Makefile.am Wed Jun 15 05:14:10 2011 > @@ -2,6 +2,7 @@ > > agent_SCRIPTS = ag_openais > > -scrconf_DATA = openais.scr > +scrconf_DATA = openais.scr \ > + csync2_ha.scr > > EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) > > Modified: trunk/cluster/src/Cluster.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/Cluster.ycp?rev=6436… > ============================================================================== > --- trunk/cluster/src/Cluster.ycp (original) > +++ trunk/cluster/src/Cluster.ycp Wed Jun 15 05:14:10 2011 > @@ -42,6 +42,9 @@ > import "PackageSystem"; > import "SuSEFirewall"; > > + > +global string csync2_key_file = "/etc/csync2/key_hagroup"; > + > /** > * Prototypes > */ > @@ -233,6 +236,30 @@ > SCR::Write(.openais, ""); > } > > +global list<string> csync2_host = []; > +global list<string> csync2_include = []; > + > +global void load_csync2_conf() > +{ > + csync2_host = (list<string>)SCR::Read(.csync2_ha.value.ha_group.host); > + csync2_include = (list<string>)SCR::Read(.csync2_ha.value.ha_group.include); > + > + if (csync2_host == nil) csync2_host = []; > + if (csync2_include == nil) csync2_include = []; > + y2milestone("read csync2 conf: csync2_host = %1", csync2_host); > + y2milestone("read csync2 conf: csync2_include = %1", csync2_include); > +} > + > +global void save_csync2_conf() > +{ > + y2milestone("write csync2 conf: csync2_host = %1", csync2_host); > + y2milestone("write csync2 conf: csync2_include = %1", csync2_include); > + > + SCR::Write(.csync2_ha.value.ha_group.host, csync2_host); > + SCR::Write(.csync2_ha.value.ha_group.include, csync2_include); > + SCR::Write(.csync2_ha.value.ha_group.key, [csync2_key_file]); > +} > + > /** > * Read all cluster settings > * @return true on success > @@ -271,7 +298,7 @@ > ); > > boolean ret = false; > - list<string> required_pack_list = ["pacemaker", "pacemaker-pygui"]; > + list<string> required_pack_list = ["pacemaker", "pacemaker-pygui", "csync2"]; > ret = PackageSystem::CheckAndInstallPackagesInteractive(required_pack_list); > if (ret == false) { > Report::Error(_("Cannot install required package")); > @@ -295,6 +322,7 @@ > if(false) Report::Error(_("Cannot read database1.")); > sleep(sl); > > + load_csync2_conf(); Please keep the established indentation rules: four columns per level, \t is 8 columns wide, preferably use 8 spaces instead. > // read another database > if(Abort()) return false; > Progress::NextStep(); > @@ -385,6 +413,8 @@ > SuSEFirewall::AddService(mcastport2, "UDP", "EXT"); > } > > + save_csync2_conf(); > + > // run SuSEconfig > SuSEFirewall::Write(); > if(Abort()) return false; > > Modified: trunk/cluster/src/common.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/common.ycp?rev=64362… > ============================================================================== > --- trunk/cluster/src/common.ycp (original) > +++ trunk/cluster/src/common.ycp Wed Jun 15 05:14:10 2011 > @@ -14,7 +14,8 @@ > list<string> DIALOG = [ > "communication", > "security", > - "service" > + "service", > + "csync2" > ]; > > map PARENT = $[ > @@ -23,7 +24,8 @@ > map NAME = $[ > "communication": _("Communication Channels"), > "security": _("Security"), > - "service": _("Service") > + "service": _("Service"), > + "csync2": _("Configure Csync2") > ]; > > void myHelp(string help) > > Modified: trunk/cluster/src/dialogs.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/dialogs.ycp?rev=6436… > ============================================================================== > --- trunk/cluster/src/dialogs.ycp (original) > +++ trunk/cluster/src/dialogs.ycp Wed Jun 15 05:14:10 2011 > @@ -45,6 +45,32 @@ > include "cluster/helps.ycp"; > include "cluster/common.ycp"; > > +list<string> csync2_suggest_files = []; > +string csync2_port = "30865"; > + > +// return `cacel or a string > +any text_input_dialog(string title, string value) > +{ > + any ret = nil; > + > + UI::OpenDialog( > + `MarginBox(1, 1, `VBox( > + `MinWidth(100, `TextEntry(`id(`text), title, value)), > + `VSpacing(1), > + `Right(`HBox( > + `PushButton(`id(`ok), _("OK")), > + `PushButton(`id(`cancel), _("Cancel")) > + )) > + )) > + ); > + > + ret = UI::UserInput(); > + if (ret == `ok) ret = UI::QueryWidget(`text, `Value); > + UI::CloseDialog(); > + return ret; > +} We should move this to Popup::TextEntry, improving it to return a string (nil on cancel). (really we don't have this already somewhere?) > + > + > boolean ValidateCommunication () > { > if (IP::Check((string)UI::QueryWidget(`id(`bindnetaddr1), `Value)) == false) { > @@ -554,6 +580,230 @@ > return ret; > } > > + > +term csync2_layout() > +{ > + return > + `VBox(`opt(`hvstretch), > + `HBox( > + `Frame(_("Sync Host"), > + `VBox( > + `SelectionBox(`id(`host_box), ""), > + `HBox( > + `PushButton(`id(`host_add), "Add"), > + `PushButton(`id(`host_del), "Del"), > + `PushButton(`id(`host_edit), "Edit") > + ) > + )), > + `HSpacing(), > + `Frame(_("Sync File"), > + `VBox( > + `SelectionBox(`id(`include_box), ""), > + `HBox( > + `PushButton(`id(`include_add), "Add"), > + `PushButton(`id(`include_del), "Del"), > + `PushButton(`id(`include_edit), "Edit"), > + `PushButton(`id(`include_suggest), "Add Suggested Files") Translation marks missing > + ) > + )) > + ), > + `HBox( > + `PushButton(`id(`generate_key), `opt(`hstretch), _("Generate Pre-Shared-Keys")), > + `PushButton(`id(`csync2_switch), `opt(`hstretch), "") > + ) > + ); > +} > + > + > +// return 1 if csync2 is not installed well > +// return 2 if csync2 is OFF > +// return 3 if csync2 is ON wow. how about boolean: nil, false, true? > +integer csync2_status() > +{ > + map ret = nil; > + > + ret = (map)SCR::Execute(.target.bash_output, "/sbin/chkconfig csync2"); see Service::Enabled > + y2milestone("chkconfig csync2 = %1", ret); > + if (issubstring(ret["stderr"]:"", "command not found") == true) return 1; > + if (issubstring(ret["stderr"]:"", "unknown service") == true) return 1; > + if (issubstring(ret["stdout"]:"", "off") == true) return 2; > + > + return 3; > +} > + > +void csync2_turn_off() > +{ > + SCR::Execute(.target.bash_output, "/sbin/chkconfig csync2 off"); Service::Disable > + if (SuSEFirewall::HaveService(csync2_port, "TCP", "EXT")) > + SuSEFirewall::RemoveService(csync2_port, "TCP", "EXT"); > +} > + > +void csync2_turn_on() > +{ > + SCR::Execute(.target.bash_output, "/sbin/chkconfig csync2 on"); Service::Enable > + if (!SuSEFirewall::HaveService(csync2_port, "TCP", "EXT")) > + SuSEFirewall::AddService(csync2_port, "TCP", "EXT"); > +} > + > +void fill_csync_entries() > +{ > + integer i = 0; > + integer ret = 0; > + integer current = 0; > + list<term> items = []; > + > + // remove duplicated elements > + Cluster::csync2_host = Cluster::csync2_host + []; > + Cluster::csync2_include = Cluster::csync2_include + []; > + > + i = 0; > + items = []; > + foreach(string value, Cluster::csync2_host, { > + items = add(items, `item(`id(i), value)); > + i = i + 1; > + }); > + current = (integer)UI::QueryWidget(`host_box, `CurrentItem); > + if (current == nil) current = 0; > + if (current >= i) current = i - 1; > + UI::ChangeWidget(`host_box, `Items, items); > + UI::ChangeWidget(`host_box, `CurrentItem, current); > + > + i = 0; > + items = []; > + foreach(string value, Cluster::csync2_include, { > + items = add(items, `item(`id(i), value)); > + i = i + 1; > + }); > + current = (integer)UI::QueryWidget(`include_box, `CurrentItem); > + if (current == nil) current = 0; > + if (current >= i) current = i - 1; > + UI::ChangeWidget(`include_box, `Items, items); > + UI::ChangeWidget(`include_box, `CurrentItem, current); > + > + ret = csync2_status(); > + UI::ChangeWidget(`id(`csync2_switch), `Enabled, (ret != 1)); > + if (ret == 1) > + UI::ChangeWidget(`id(`csync2_switch), `Label, "Csync2 Status Unknown"); > + if (ret == 2) > + UI::ChangeWidget(`id(`csync2_switch), `Label, "Turn csync2 ON"); > + if (ret == 3) > + UI::ChangeWidget(`id(`csync2_switch), `Label, "Turn csync2 OFF"); _() missing > +} > + > + > +any Csync2Dialog() > +{ > + any ret = nil; > + > + my_SetContents("csync2", csync2_layout()); > + > + > + while(true) { > + fill_csync_entries(); > + > + ret = UI::UserInput(); > + > + if (ret == `abort || ret == `cancel) { > + if (ReallyAbort()) break; > + continue; > + } > + > + if (ret == `next || ret == `back) { > + break; > + } > + > + if (ret == `wizardTree) > + ret = (string)UI::QueryWidget(`id(`wizardTree), `CurrentItem); > + > + if (contains(DIALOG, (string)ret)) { > + ret = symbolof(toterm(ret)); > + //SaveCsync2(); > + break; > + } else { > + Wizard::SelectTreeItem("csync2"); > + continue; > + } > + > + if (ret == `host_add) { > + ret = text_input_dialog(_("Input a new host"), ""); > + if (ret == `cancel) continue; > + Cluster::csync2_host = add(Cluster::csync2_host, (string)ret); > + } > + > + if (ret == `host_edit) { > + integer current = 0; > + string str = ""; > + > + current = (integer)UI::QueryWidget(`host_box, `CurrentItem); > + ret = text_input_dialog(_("Edit a host"), Cluster::csync2_host[current]:""); > + if (ret == `cancel) continue; > + Cluster::csync2_host[current] = (string)ret; > + } > + > + if (ret == `host_del) { > + integer current = 0; > + current = (integer)UI::QueryWidget(`host_box, `CurrentItem); > + Cluster::csync2_host = remove(Cluster::csync2_host, current); > + } > + > + if (ret == `include_add) { > + ret = text_input_dialog(_("Input a new sync file"), ""); > + if (ret == `cancel) continue; > + Cluster::csync2_include = add(Cluster::csync2_include, (string)ret); > + } > + > + if (ret == `include_edit) { > + integer current = 0; > + > + current = (integer)UI::QueryWidget(`include_box, `CurrentItem); > + ret = text_input_dialog(_("Edit a sync file"), Cluster::csync2_include[current]:""); > + if (ret == `cancel) continue; > + Cluster::csync2_include[current] = (string)ret; > + } > + > + if (ret == `include_del) { > + integer current = 0; > + current = (integer)UI::QueryWidget(`include_box, `CurrentItem); > + Cluster::csync2_include = remove(Cluster::csync2_include, current); > + } > + > + if (ret == `include_suggest) { > + Cluster::csync2_include = Cluster::csync2_include + csync2_suggest_files; > + } > + > + if (ret == `generate_key) { > + string key_file = Cluster::csync2_key_file; > + > + // key file exist > + if (SCR::Read(.target.size, key_file) > 0) { > + if (!Popup::YesNo(sformat(_("Key file %1 already exist.\nDo you want to overwrite it?"), key_file))) > + continue; > + > + // remove exist key file > + if (SCR::Execute(.target.remove, key_file) == false) { > + Popup::Message(sformat(_("Delete key file %1 failed."), key_file)); > + continue; > + } > + } > + > + // generate key file > + ret = SCR::Execute(.target.bash, sformat("csync2 -k %1", key_file)); > + if (ret == 0) > + Popup::Message(sformat(_("Key file %1 is generated.\nPlease copy this file to all members of the cluster."), key_file)); > + else > + Popup::Message("Key generation failed."); _() > + } > + > + if (ret == `csync2_switch) { > + string label = ""; > + label = (string)UI::QueryWidget(`csync2_switch, `Label); > + if (issubstring(label, "OFF")) csync2_turn_off(); > + if (issubstring(label, "ON")) csync2_turn_on(); > + } > + } > + > + return ret; > +} > /* EOF */ > } > > > Modified: trunk/cluster/src/helps.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/helps.ycp?rev=64362&… > ============================================================================== > --- trunk/cluster/src/helps.ycp (original) > +++ trunk/cluster/src/helps.ycp Wed Jun 15 05:14:10 2011 > @@ -50,6 +50,13 @@ > <big>Booting</big> Starting openais service during boot or not > <big>Start mgmtd</big> Mgmtd daemon is a standalone service daemon. It is required by the GUI > "), > + > + "csync2" : _(" > + <big>Sync Host</big> The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command. > + <big>Sync File</big> The full absolute filename to be synced. > + <big>Pre-Shared-Keys</big> Authentication is performed using the IP addresses and pre-shared-keys in Csync2. The key file is generated with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be copied to all members of the cluster manually after it's created. > + "), > + > /* Read dialog help 1/2 */ > "read" : _("<big>Initializing cluster Configuration</big> > Please wait... > > Modified: trunk/cluster/src/wizards.ycp > URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/wizards.ycp?rev=6436… > ============================================================================== > --- trunk/cluster/src/wizards.ycp (original) > +++ trunk/cluster/src/wizards.ycp Wed Jun 15 05:14:10 2011 > @@ -41,7 +41,8 @@ > map Aliases = $[ > "communication": ``(CommunicationDialog()), > "security": ``(SecurityDialog()), > - "service": ``(ServiceDialog()) > + "service": ``(ServiceDialog()), > + "csync2": ``(Csync2Dialog()) > ]; > > > @@ -86,7 +87,8 @@ > "ws_start" : "communication", > "communication": $[ `next:"security", `back:"communication", `abort:`abort ], > "security": $[ `next:"service", `back:"communication", `abort:`abort ], > - "service": $[ `next:`next, `back:"security", `abort:`abort ], > + "service": $[ `next:"csync2", `back:"security", `abort:`abort ], > + "csync2" : $[ `next:`next, `back:"service", `abort:`abort ], > ]; > > any ret = Sequencer::Run(Aliases, sequence); > > -- > To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org > For additional commands, e-mail: yast-commit+help(a)opensuse.org > -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

1 0