From 71b5bc3aaff0707cf98393b467870bcaa17f3aaa Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Wed, 11 Feb 2004 09:03:24 +0000
Subject: check httpd for apace-1.3, httpd for apache2

---
 web_wizard/Apache.pm | 10 ++++++----
 1 file 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;
-- 
cgit v1.2.1