summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xweb_wizard/Apache.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index e25f4418..63e33d18 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -162,11 +162,13 @@ sub new {
$config = $conf;
if ($config->{ver} == 2) {
$file = "/etc/httpd/conf/httpd2.conf";
- $o->{needed_rpm} = [ 'apache2' ]
+ $o->{needed_rpm} = [ 'apache2' ];
+ $o->{var}{servicecheck} = 'httpd2';
} else {
$file = "/etc/httpd/conf/httpd.conf";
- $o->{needed_rpm} = [ 'apache' ]
- }
+ $o->{needed_rpm} = [ 'apache-1.3' ];
+ $o->{var}{servicecheck} = 'httpd';
+ }
bless {
o => $o,
}, $class;
@@ -258,7 +260,7 @@ sub do_it {
services::start('httpd')
}
undef $w;
- check_started('httpd');
+ check_started($o->{var}{servicecheck});
}
1;