diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2004-07-29 02:55:04 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2004-07-29 02:55:04 +0000 |
| commit | d03adb770059f5e41a20477239ba5c20d4c27dfd (patch) | |
| tree | b471d251b538095d5aafbce9a5217bd9a510d49f /web_wizard | |
| parent | 09049e4a3f7963fdb6aeaedd4c02bcc9790dab5f (diff) | |
| download | drakwizard-d03adb770059f5e41a20477239ba5c20d4c27dfd.tar drakwizard-d03adb770059f5e41a20477239ba5c20d4c27dfd.tar.gz drakwizard-d03adb770059f5e41a20477239ba5c20d4c27dfd.tar.bz2 drakwizard-d03adb770059f5e41a20477239ba5c20d4c27dfd.tar.xz drakwizard-d03adb770059f5e41a20477239ba5c20d4c27dfd.zip | |
force use apache2
Diffstat (limited to 'web_wizard')
| -rwxr-xr-x | web_wizard/Apache.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm index d7094847..ae58661e 100755 --- a/web_wizard/Apache.pm +++ b/web_wizard/Apache.pm @@ -44,8 +44,8 @@ my $o = { user_dir => '', shared_dir => '' }, - needed_rpm => '', - defaultimage => "$ENV{__WIZ_HOME__}web_wizard/images/apache.png", + needed_rpm => [ 'apache2' ], + defaultimage => "/usr/share/wizards/web_wizard/images/apache.png", init => sub { if (-f $file) { open my $FH, $file or die "$! ($file)"; @@ -160,15 +160,15 @@ available on your http server via http://www.yourserver.com/~user."), 70)), type sub new { my ($class, $conf) = @_; $config = $conf; - if ($config->{ver} == 2) { +# 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-1.3' ]; - $o->{var}{servicecheck} = 'httpd'; - } +# } else { +# $file = "/etc/httpd/conf/httpd.conf"; +# $o->{needed_rpm} = [ 'apache-1.3' ]; +# $o->{var}{servicecheck} = 'httpd'; +# } bless { o => $o, }, $class; |