- merged 5.7 from DEVEL: cvs up -j HEAD -j DEVEL, except manually re-merged changelog...

[packages/drupal.git] / drupal.conf

diff --git a/drupal.conf b/drupal.conf
index 25a85634a1ea0cbbda4ef8efdb1ae5a098754415..8d06f07a2d8ec821aadf940edaabf3857cdcc810 100644 (file)
--- a/drupal.conf
+++ b/drupal.conf
@@ -9,8 +9,10 @@
 <Directory /usr/share/drupal/htdocs>
     Options FollowSymLinks
     AllowOverride None
-    Order allow,deny
-    Allow from all
+    <IfModule mod_access.c>
+        order allow,deny
+        allow from all
+    </IfModule>
 
     # Set the default handler.
     <IfModule mod_dir.c>
@@ -91,12 +93,7 @@
 #</Location>
 
 <Directory /var/lib/drupal>
-    Allow from all
-    SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-    Options None
-    <IfModule mod_rewrite.c>
-        RewriteEngine off
-    </IfModule>
+    allow from all
 </Directory>
 
 <VirtualHost *:80>
@@ -108,3 +105,5 @@
         Alias /files /var/lib/drupal
     </IfModule>
 </VirtualHost>
+
+# vim: filetype=apache ts=4 sw=4 et