summaryrefslogtreecommitdiffstats
path: root/web_wizard/Apache.pm
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2004-02-11 09:03:24 +0000
committerAntoine Ginies <aginies@mandriva.com>2004-02-11 09:03:24 +0000
commit71b5bc3aaff0707cf98393b467870bcaa17f3aaa (patch)
treeeff1cd14806077c12bef42b9e8449fc54d9aa8e9 /web_wizard/Apache.pm
parent8c6c91ccb07761277bb34491f4ada760323c34a5 (diff)
downloaddrakwizard-71b5bc3aaff0707cf98393b467870bcaa17f3aaa.tar
drakwizard-71b5bc3aaff0707cf98393b467870bcaa17f3aaa.tar.gz
drakwizard-71b5bc3aaff0707cf98393b467870bcaa17f3aaa.tar.bz2
drakwizard-71b5bc3aaff0707cf98393b467870bcaa17f3aaa.tar.xz
drakwizard-71b5bc3aaff0707cf98393b467870bcaa17f3aaa.zip
check httpd for apace-1.3, httpd for apache2
Diffstat (limited to 'web_wizard/Apache.pm')
-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;