diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist index 82cee7e..aaa02e3 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist @@ -8,11 +8,11 @@ my @users = split(/[;,]/, ($phplist{'AdminUsers'} || 'admin')); my $users = join(' ', @users); my $allow = ( $access eq 'public' ) ? 'all' : "$localAccess $externalSSLAccess"; -$alias = ($alias ne 'enabled') ? '' : 'Alias /phplist /usr/share/phplist/www/'; -$auth = ( $auth eq 'http' ) ? '' : 'AuthName "phplist"' . "\n" . - " AuthType Basic\n" . - " AuthExternal pwauth\n" . - " require user $users\n"; +$alias = ($alias ne 'enabled') ? '' : 'Alias /lists /usr/share/phplist/www/'; +$auth = ( $auth eq 'http' ) ? 'AuthName "phplist"' . "\n" . + " AuthType Basic\n" . + " AuthExternal pwauth\n" . + " require user $users\n" : ''; if ($status eq 'enabled') { $OUT .=<<"EOF"; @@ -22,33 +22,31 @@ $alias Options None AllowOverride None + DirectoryIndex index.php AddType application/x-httpd-php .php .php3 php_admin_value openbase_dir /usr/share/phplist:/var/lib/phplist:/tmp:/etc/phplist php_admin_flag file_uploads on php_admin_value upload_max_filesize 5M php_admin_value post_max_size 6M php_admin_value memory_limit 128M - + php_admin_value session.save_path /var/lib/phplist/tmp + php_admin_value upload_tmp_dir /var/lib/phplist/tmp + Order allow,deny deny from all - - Order allow,deny - allow from $allow - + Order deny,allow + deny from all + allow from $allow # Admin section SSLRequireSSL on - + Order allow,deny Deny from all - - Order allow,deny - allow from all - order deny,allow deny from all allow from $allow