summaryrefslogtreecommitdiffstats
path: root/web_wizard/Apache.pm
diff options
context:
space:
mode:
Diffstat (limited to 'web_wizard/Apache.pm')
-rwxr-xr-xweb_wizard/Apache.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index fd5b87b7..d9778042 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -3,7 +3,7 @@
# Drakwizard
# Copyright (C) 2002, 2003 Mandrakesoft
-#
+#
# Authors: Arnaud Desmons <adesmons@mandrakesoft.com>
# Florent Villard <warly@mandrakesoft.com>
#
@@ -35,7 +35,7 @@ my $file;
my $root;
my $config;
-my $o = {
+my $o = {
name => N("Web wizard"),
var => {
web_internal => '',
@@ -161,9 +161,9 @@ sub new {
my ($class, $conf) = @_;
$config = $conf;
# if ($config->{ver} == 2) {
- $file = "/etc/httpd/conf/httpd2.conf";
+ $file = "/etc/httpd/conf/httpd.conf";
# $o->{needed_rpm} = [ 'apache2' ];
- $o->{var}{servicecheck} = 'httpd2';
+ $o->{var}{servicecheck} = 'httpd';
# } else {
# $file = "/etc/httpd/conf/httpd.conf";
# $o->{needed_rpm} = [ 'apache-1.3' ];
@@ -190,7 +190,7 @@ sub chg_docroot {
substInFile {
s|^\s*<Directory\s*/var/www/html/?>|<Directory $o->{var}{shared_dir}>|;
- } "/etc/httpd/conf/commonhttpd.conf";
+ } "/etc/httpd/conf/httpd.conf";
}
sub is_user_mod {
@@ -208,7 +208,7 @@ sub is_last_user_mod {
}
sub get_user_dir {
- my %conf = MDK::Wizard::Varspaceval->get("/etc/httpd/conf/commonhttpd.conf");
+ my %conf = MDK::Wizard::Varspaceval->get("/etc/httpd/conf/httpd.conf");
$conf{UserDir};
}
@@ -217,16 +217,16 @@ sub chg_user_dir {
if ($o->{var}{user_mod}) {
substInFile {
s|(/home/\*/)$root(/?)|$1$o->{var}{user_dir}$2|g;
- } "/etc/httpd/conf/commonhttpd.conf";
+ } "/etc/httpd/conf/httpd.conf";
substInFile {
s|(\s*)UserDir\s*$root(/?)|$1UserDir $o->{var}{user_dir}$2|g;
s|(/home/\*/)$root(/?)|$1$o->{var}{user_dir}$2|g;
- } "/etc/httpd/conf/commonhttpd.conf";
+ } "/etc/httpd/conf/httpd.conf";
}
else {
substInFile {
s|(\s*)UserDir\s*$root(/?)|$1UserDir disabled$2|g;
- } "/etc/httpd/conf/commonhttpd.conf";
+ } "/etc/httpd/conf/httpd.conf";
}
}
@@ -235,7 +235,7 @@ sub do_it {
my $in = 'interactive'->vnew('su', 'Apache');
my $w = $in->wait_message(N("Apache server"), N("Configuring your system as Apache server ..."));
- my $file = "/etc/httpd/conf/commonhttpd.conf";
+ my $file = "/etc/httpd/conf/httpd.conf";
my $that = "localhost";
if ($o->{var}{web_external} eq "1") {