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, 7 insertions, 6 deletions

diff --git a/news_wizard/Inn.pm b/news_wizard/Inn.pm
index 71e33c1f..5c435e5f 100755
--- a/news_wizard/Inn.pm
+++ b/news_wizard/Inn.pm
@@ -30,11 +30,11 @@ my $wiz = new MDK::Wizard::Wizcommon;
 my $o = { 
     name => 'News Wizard',
 	var => { 
-	    wiz_news_server => '',
-	    wiz_news_freq => ''
+	    news_server => '',
+	    news_freq => ''
 	},
 	needed_rpm => [ 'inn' ],
-	defaultimage => "$ENV{__WIZARD_HOME__}news_wizard/images/news.png"
+	defaultimage => "$ENV{__WIZ_HOME__}news_wizard/images/news.png"
     };
 
 $o->{pages} = { 
@@ -44,7 +44,7 @@ $o->{pages} = {
 	          next => 'ask_news_server'
 	      },
 	      ask_news_server => {
-	          name => N('News Server') . "\n\n" . N('The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider.') . "\n\n" . N('Internet host names must be in the form \qhost.domain.domaintype\q; for example, if your provider is \qprovider.com\q, the internet news server is usually \qnews.provider.com\q.'),
+	          name => N('News Server') . "\n\n" . N('The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider.') . "\n\n" . N('Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet news server is usually "news.provider.com".'),
                   pre => sub {
 			$o->{var}{news_server} ||= get_server();
 		  },
@@ -136,11 +136,12 @@ sub normalize_server {
 
 sub do_it {
     $::testing and return;
-    $o->{var}{wiz_news_freq} and my $freq = normalize_freq($o->{var}{wiz_news_freq}) or
+    $o->{var}{news_freq} and my $freq = normalize_freq($o->{var}{news_freq}) or
       die "freq not defined: $!";
-    $o->{var}{wiz_news_server} and my $server = normalize_server($o->{var}{wiz_news_server}) or
+    $o->{var}{news_server} and my $server = normalize_server($o->{var}{news_server}) or
       die "server not defined: $!";
     my $file = "/etc/leafnode/config";
+    -d "/etc/leafnode" or mkdir "/etc/leafnode";
     output($file, map { 
 	s|__server__|$server|g;
 	$_;