fix apache

fix dns_client adding a \n at the end of the line of the configuration file
fix squid
fix inn
fix ftp
fix samba
add a init function in drakwizard.pl for case such as apache which need to initialize some parameters
separate region/country in ntp wizard

1 files changed, 8 insertions, 3 deletions

diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index fbee9a5b..70cb2f8d 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -22,6 +22,7 @@ package MDK::Wizard::Proftpd;
 use strict;
 
 use common;
+use services;
 require MDK::Wizard::Wizcommon;
 
 my $wiz = new MDK::Wizard::Wizcommon;
@@ -34,7 +35,7 @@ my $o = {
 	    wiz_ftp_home => ''
 	},
 	needed_rpm => [ 'proftpd' ],
-	defaultimage => "$ENV{__WIZARD_HOME__}ftp_wizard/images/FTP.png"
+	defaultimage => "$ENV{__WIZ_HOME__}ftp_wizard/images/FTP.png"
     };
 
 $o->{pages} = { 
@@ -59,7 +60,7 @@ $o->{pages} = {
 	      warning_dhcp => {
 		name => N('Warning.'),
 		data => [ { label => N('Warning\nYou are in dhcp, server may not work with your configuration.') } ],
-	        next => 'summary'
+	        next => 'config'
 	      },
 	      must_be_root => {
 		name => N('Error.'),
@@ -227,7 +228,11 @@ sub do_it {
 	    }
 	} $file;
     }
-    system("/etc/rc.d/init.d/proftpd restart");
+    if (services::is_service_running('proftpd')) { 
+        services::restart('proftpd')
+    } else {
+        services::start('proftpd')
+    }
 }
 
 1;