From 2db4904668c28238bf7a308e0b4629f0a2b3351b Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 11 Oct 2013 14:07:59 +0200
Subject: [PATCH] Some fixes in httpd templates

---
 .../templates/etc/httpd/conf/httpd.conf/98phplist  | 28 ++++++++++------------
 1 file changed, 13 insertions(+), 15 deletions(-)

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
 <Directory /usr/share/phplist/www/>
     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
-    <FilesMatch "\.(php|inc)\$">
+    php_admin_value session.save_path /var/lib/phplist/tmp
+    php_admin_value upload_tmp_dir /var/lib/phplist/tmp
+    <FilesMatch "\\.inc\$">
         Order allow,deny
         deny from all
     </FilesMatch>
-    <FilesMatch "(index.php|dl.php|ut.php|lt.php|download.php|connector.php)\$">
-        Order allow,deny
-        allow from $allow
-    </FilesMatch>
+    Order deny,allow
+    deny from all
+    allow from $allow
 </Directory>
 
 # Admin section
 <Directory /usr/share/phplist/www/admin>
     SSLRequireSSL on
-    <FilesMatch "\.(php|inc)\$">
+    <FilesMatch "\\.inc\$">
         Order allow,deny
         Deny from all
     </FilesMatch>
-    <FilesMatch "(index.php|connector.php|upload.php)\$">
-        Order allow,deny
-        allow from all
-    </FilesMatch>
     order deny,allow
     deny from all
     allow from $allow