diff options
| -rwxr-xr-x | web_wizard/Apache.pm | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm index da6aee57..845d8e8c 100755 --- a/web_wizard/Apache.pm +++ b/web_wizard/Apache.pm @@ -60,12 +60,12 @@ my $o = { } close($FH); } else { - return 0, N("%s does not exist.", $file) + return 0, N("%s does not exist.", $file); } - 1 + 1; } }; - +$::Wizard_pix_up = "/usr/share/mcc/themes/default/web_server-mdk.png"; $o->{pages} = { welcome => { @@ -76,6 +76,10 @@ $o->{pages} = { }, config => { name => N("Web server") . "\n\n" . N("Your server can act as a Web server toward your internal network (intranet) and as a Web server for the Internet.") . "\n\n" . N("Select the kind of Web service you want to activate:") . "\n\n" . N("Don't check any box if you don't want to activate your Web server."), + pre => sub { + $o->{var}{web_internal} = 1; + $o->{var}{web_external} = 1; + }, data => [ { text => N("Enable the Web server for the intranet"), type => 'bool', val => \$o->{var}{web_internal} }, { text => N("Enable the Web server for the Internet"), type => 'bool', val => \$o->{var}{web_external} }, @@ -98,9 +102,9 @@ $o->{pages} = { }, user_dir => { name => N("Type the name of the directory users should create in their homes (without ~/) to get it available via http://www.yourserver.com/~user"), - pre => sub { + pre => sub { $o->{var}{user_dir} = get_user_dir(); - if ($o->{var}{user_dir} =~ /disabled/) { + if ($o->{var}{user_dir} =~ /disabled/ or !$o->{var}{user_dir}) { $o->{var}{user_dir} = 'public_html'; } }, @@ -121,7 +125,7 @@ $o->{pages} = { ], complete => sub { if (! -d $o->{var}{shared_dir}) { - $::in->ask_warn(N('Error'), N('The path you entered does not exist.')); return 1; } + $::in->ask_warn(N("Error"), N("The path you entered does not exist.")); return 1; } else { return 0; }; }, next => 'summary', @@ -179,11 +183,11 @@ sub chg_docroot { } $file; substInFile { - s|^\s*<Directory\s*$old/?>|<Directory $o->{var}{shared_dir}>|; + s|^(\s*\|)<Directory\s*$old/?>|<Directory $o->{var}{shared_dir}>|; } $file if $old; substInFile { - s|^\s*<Directory\s*/var/www/html/?>|<Directory $o->{var}{shared_dir}>|; + s|^(\s*\|)<Directory\s*.*|<Directory $o->{var}{shared_dir}>|; } $file; } |