[yast-commit] r49500 - in /trunk/instserver: VERSION package/yast2-instserver.changes src/Instserver.ycp src/dialogs.ycp

Author: lslezak Date: Wed Jul 30 09:18:00 2008 New Revision: 49500 URL: http://svn.opensuse.org/viewcvs/yast?rev=49500&view=rev Log: - fixed service name in the firewallconfiguration, install the needed packages before reading service files (bnc#403377) - added firewall config in the FTP server configuration dialog - 2.17.0 Modified: trunk/instserver/VERSION trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/Instserver.ycp trunk/instserver/src/dialogs.ycp Modified: trunk/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/VERSION?rev=49500&r1=49499&r2=49500&view=diff ============================================================================== --- trunk/instserver/VERSION (original) +++ trunk/instserver/VERSION Wed Jul 30 09:18:00 2008 @@ -1 +1 @@ -2.16.5 +2.17.0 Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instserver.changes?rev=49500&r1=49499&r2=49500&view=diff ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Wed Jul 30 09:18:00 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jul 30 09:13:55 CEST 2008 - lslezak@suse.cz + +- fixed service name in the firewallconfiguration, install the + needed packages before reading service files (bnc#403377) +- added firewall config in the FTP server configuration dialog +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/Instserver.ycp?rev=49500&r1=49499&r2=49500&view=diff ============================================================================== --- trunk/instserver/src/Instserver.ycp (original) +++ trunk/instserver/src/Instserver.ycp Wed Jul 30 09:18:00 2008 @@ -246,20 +246,18 @@ return ret; } -/** - * Setup FTP server - * @param string inst server root - * @param string ftp server root - * @return boolean - */ -global boolean SetupFTP(string dir, string ftproot, string ftpalias) { - +global boolean InstallFTPPackages() +{ string help = _("The FTP installation server requires an FTP server package. The vsftpd package will now be installed. "); if ( !Package::InstalledAll( [ "xinetd", "vsftpd", "openslp-server", "yast2-inetd" ] ) ) { y2milestone("some packages are not installed"); } + else + { + return true; + } if ( !Package::InstallAll( [ "xinetd", "vsftpd" , "openslp-server", "yast2-inetd"])) { Report::Error( Message::CannotContinueWithoutPackagesInstalled() ); @@ -267,6 +265,22 @@ return false; } + return true; +} + +/** + * Setup FTP server + * @param string inst server root + * @param string ftp server root + * @return boolean + */ +global boolean SetupFTP(string dir, string ftproot, string ftpalias) { + + if (!InstallFTPPackages()) + { + return false; + } + // create repository directory if it doesn't exist SCR::Execute(.target.bash, sformat("[ -d %1 ] || /bin/mkdir %1", dir)); @@ -360,15 +374,8 @@ } } - -/** - * Setup HTTP server - * @param string inst server root - * @param string alias - * @return boolean - */ -global boolean SetupHTTP(string dir, string alias) { - +global boolean InstallHTTPPackages() +{ string help = _("The HTTP installation server requires an HTTP server package. The apache2 package will now be installed."); if ( !Package::InstalledAll( [ "apache2" , "openslp-server" ] ) ) { @@ -382,6 +389,22 @@ } } + return true; +} + +/** + * Setup HTTP server + * @param string inst server root + * @param string alias + * @return boolean + */ +global boolean SetupHTTP(string dir, string alias) { + + if (!InstallHTTPPackages()) + { + return false; + } + if ((integer)SCR::Read(.target.size, "/etc/apache2/conf.d/inst_server.conf.in") > 0 ) { string conf = (string)SCR::Read(.target.string, "/etc/apache2/conf.d/inst_server.conf.in"); Modified: trunk/instserver/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/dialogs.ycp?rev=49500&r1=49499&r2=49500&view=diff ============================================================================== --- trunk/instserver/src/dialogs.ycp (original) +++ trunk/instserver/src/dialogs.ycp Wed Jul 30 09:18:00 2008 @@ -1306,7 +1306,7 @@ // firewall widget using CWM map fw_settings = $[ - "services": [ "nfs-server" ], + "services": [ "service:nfs-kernel-server" ], "display_details": true, ]; @@ -1382,6 +1382,13 @@ * @return dialog result */ any FtpDialog () { + // firewall widget using CWM + map fw_settings = $[ + "services": [ "service:vsftpd" ], + "display_details": true, + ]; + + map fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget(fw_settings); /* Instserver configure2 dialog caption */ string caption = _("Installation Server -- FTP"); @@ -1393,7 +1400,9 @@ `HVSquash( `VBox( `Left(`TextEntry(`id(`ftproot), _("&FTP Server Root Directory:"), ftproot )), - `Left(`TextEntry(`id(`ftpalias), _("&Directory Alias:"), ftpalias )) + `Left(`TextEntry(`id(`ftpalias), _("&Directory Alias:"), ftpalias )), + `VSpacing(1), + fw_cwm_widget["custom_widget"]:`Empty() ) ); @@ -1401,10 +1410,24 @@ Wizard::SetContentsButtons(caption, contents, HELPS["ftp"]:"ftp", Label::BackButton(), Label::NextButton()); + // install packages before calling SuSEFirewall::Read() + // to read the service definition file + if (!Instserver::InstallFTPPackages()) + { + y2error("FTP server package is not installed, cannot continue"); + return `abort; + } + + // initialize the firewall widget (set the current value) + CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + any ret = nil; + map event = $[]; + while(true) { - ret = UI::UserInput(); + event = UI::WaitForEvent(); + ret = event["ID"]:nil; ftproot = (string)UI::QueryWidget(`id(`ftproot), `Value); ftpalias = (string)UI::QueryWidget(`id(`ftpalias), `Value); @@ -1423,6 +1446,8 @@ Instserver::ServerSettings["ftpalias"] = ftpalias; if (!Instserver::ServerSettings["dry"]:false) { + // store the firewall setting, (activation is in SetupFTP()) + CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); r = Instserver::SetupFTP(Instserver::ServerSettings["directory"]:"" , ftproot , ftpalias); if (!r) { @@ -1434,10 +1459,9 @@ Instserver::modified = true; break; } - else { - y2error("unexpected retcode: %1", ret); - continue; - } + + // handle the events, enable/disable the button, show the popup if the firewall button has been clicked + CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event); } return ret; @@ -1454,7 +1478,7 @@ // firewall widget using CWM map fw_settings = $[ - "services": [ "http" ], + "services": [ "service:apache2" ], "display_details": true, ]; @@ -1481,6 +1505,14 @@ any ret = nil; map event = $[]; + // install packages before calling SuSEFirewall::Read() + // to read the service definition file + if (!Instserver::InstallHTTPPackages()) + { + y2error("HTTP server package is not installed, cannot continue"); + return `abort; + } + while(true) { event = UI::WaitForEvent(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org