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

diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index 12567d8d..427ad257 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -37,7 +37,7 @@ my $o = {
 	    wiz_ext_mail_relay => ''
 	},
 	needed_rpm => [ 'postfix' ],
-	defaultimage => "$ENV{__WIZARD_HOME__}postfix_wizard/images/courrier.png"
+	defaultimage => "$ENV{__WIZ_HOME__}postfix_wizard/images/courrier.png"
     };
 
 $o->{pages} = { 
@@ -47,7 +47,7 @@ $o->{pages} = {
           next => 'config'
       },
       config => {
-          name => N("Outgoing Mail Address") . "\n\n" . N("You can select the kind of address that outgoing mail will show in the \qFrom:\q and \qReply-to\q field.") . "\n\n" . N("This should be chosen consistently with the address you use for incoming mail."),
+          name => N("Outgoing Mail Address") . "\n\n" . N("You can select the kind of address that outgoing mail will show in the "From:" and "Reply-to" field.") . "\n\n" . N("This should be chosen consistently with the address you use for incoming mail."),
           pre => sub {
 		$o->{var}{wiz_mail_masquerade} ||= get_mail_masquerade();
 	  },
@@ -71,7 +71,7 @@ $o->{pages} = {
         next => 'config'
       },
       isp => {
-          name => N("Internet Mail Gateway") . "\n\n" . N("Your server will send the outgoing through a mail gateway, that will take care of the final delivery.") . "\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 mail server is usually \qsmtp.provider.com\q."),
+          name => N("Internet Mail Gateway") . "\n\n" . N("Your server will send the outgoing through a mail gateway, that will take care of the final delivery.") . "\n\n" . N("Internet host names must be in the form "host.domain.domaintype"; for example, if your provider is "provider.com", the internet mail server is usually "smtp.provider.com"."),
           pre => sub {
 		$o->{var}{wiz_ext_mail_relay} ||= get_mail_relay();
 	  },