diff options
| -rwxr-xr-x | postfix_wizard/Postfix.pm | 9 | ||||
| -rwxr-xr-x | proxy_wizard/Squid.pm | 13 | ||||
| -rw-r--r-- | pxe_wizard/Pxe.pm | 8 | ||||
| -rwxr-xr-x | samba_wizard/Samba.pm | 10 |
4 files changed, 37 insertions, 3 deletions
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm index bfc966f8..9e04696f 100755 --- a/postfix_wizard/Postfix.pm +++ b/postfix_wizard/Postfix.pm @@ -148,6 +148,13 @@ $o->{pages} = { end => 1, next => 0 }, + error_end => { + name => N("Failed"), + data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ], + no_back => 1, + end => 1, + next => 0, + }, }; sub new { @@ -245,6 +252,7 @@ sub do_it_internal { } cmd_needed(); undef $w; + check_started('master'); } sub do_it_external { @@ -285,6 +293,7 @@ sub do_it_external { } cmd_needed(); undef $w; + check_started('master'); } 1; diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm index ae8254cb..e2687b33 100755 --- a/proxy_wizard/Squid.pm +++ b/proxy_wizard/Squid.pm @@ -26,7 +26,7 @@ use strict; use common; use services; -require MDK::Wizard::Wizcommon; +use MDK::Wizard::Wizcommon; my $wiz = new MDK::Wizard::Wizcommon; my $df = -d '/var/spool/squid' ? `/bin/df -m /var/spool/squid` : `/bin/df -m /var/spool`; @@ -172,7 +172,15 @@ $o->{pages} = { name => N("Congratulations") . N("The wizard have successfully configured your proxy server."), end => 1, next => 0 - }, + }, + error_end => { + name => N("Failed"), + data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ], + no_back => 1, + end => 1, + next => 0, + }, + }; sub new { @@ -273,5 +281,6 @@ level = $o->{var}{wiz_squid_level}"); services::start('squid') } undef $w; + check_started('squid'); } 1; diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm index 48aa7d4b..d53f1968 100644 --- a/pxe_wizard/Pxe.pm +++ b/pxe_wizard/Pxe.pm @@ -275,6 +275,13 @@ $o->{pages} = { end => 1, next => 0 }, + error_end => { + name => N("Failed"), + data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ], + no_back => 1, + end => 1, + next => 0, + }, }; @@ -510,6 +517,7 @@ EOF tftp_blksize('N'); system("service $_ restart") foreach qw(xinetd pxe); undef $w; + check_started($_) foreach qw(xinetd pxe); } diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm index 4ee36853..91d138d4 100755 --- a/samba_wizard/Samba.pm +++ b/samba_wizard/Samba.pm @@ -56,7 +56,7 @@ my $o = { if (-f $file) { $old = read_conf($file); } else { - return (0, N("%s does not exist.", $file)) + return 0, N("%s does not exist.", $file) } } }; @@ -229,6 +229,13 @@ configure Samba.") . "\n\n" . N("To accept these values, and configure your serv end => 1, next => 0 }, + error_end => { + name => N("Failed"), + data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ], + no_back => 1, + end => 1, + next => 0, + }, }; sub new { @@ -518,5 +525,6 @@ sub do_it { services::start('smb') } undef $w; + check_started('smbd'); } 1; |