diff options
Diffstat (limited to 'web_wizard')
| -rwxr-xr-x | web_wizard/Apache.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm index 12e9d9f5..e23c12fa 100755 --- a/web_wizard/Apache.pm +++ b/web_wizard/Apache.pm @@ -49,7 +49,7 @@ my $o = { if (-f $file) { open my $FH, $file or die "$! ($file)"; while (<$FH>) { - if (/^\s*\#?\s*DocumentRoot\s+(.*)/) { + if (/^\s*#?\s*DocumentRoot\s+(.*)/) { close($FH); $root = $1; last; @@ -86,7 +86,7 @@ $o->{pages} = { }, ask_mod => { name => N("Modules :") . "\n\n" . N("* User module : allows users to have a directory in their home directories available on your http server via http://www.yourserver.com/~user, you will be asked for the name of this directory afterward."), - pre => sub { $o->{var}{user_mod} = is_last_user_mod()}, + pre => sub { $o->{var}{user_mod} = is_last_user_mod() }, data => [ { text => N("Allows users to get a directory in their homes directories available on your http server via http://www.yourserver.com/~user."), type => 'bool', val => \$o->{var}{user_mod} }, @@ -171,7 +171,7 @@ sub check_dir { sub chg_docroot { my $old; substInFile { - s|(^\s*\#?\s*DocumentRoot\s*)(\S*).*|$1$o->{var}{shared_dir}| and $old ||=$2; + s|(^\s*#?\s*DocumentRoot\s*)(\S*).*|$1$o->{var}{shared_dir}| and $old ||= $2; } $file; substInFile { @@ -234,9 +234,9 @@ sub do_it { } cp_af($file, $file.".orig"); substInFile { - if( m /^\s*<Directory.*>/s...m/^\s*<\/Directory>/s ) { - { s /^\s*Allow .*$/ Allow from $that\n/s;} - ;} + if (m/^\s*<Directory.*>/s...m!^\s*</Directory>!s) { + { s/^\s*Allow .*$/ Allow from $that\n/s } + } } $file; chg_docroot(); chg_user_dir(); |