- drop old triggers

[packages/drupal.git] / drupal.conf

diff --git a/drupal.conf b/drupal.conf
index 7b7024a7c0b832c62bc6bb0abe6305f4f37e6e07..25a85634a1ea0cbbda4ef8efdb1ae5a098754415 100644 (file)
--- a/drupal.conf
+++ b/drupal.conf
@@ -9,10 +9,8 @@
 <Directory /usr/share/drupal/htdocs>
     Options FollowSymLinks
     AllowOverride None
-    <IfModule mod_access.c>
-        order allow,deny
-        allow from all
-    </IfModule>
+    Order allow,deny
+    Allow from all
 
     # Set the default handler.
     <IfModule mod_dir.c>
@@ -22,13 +20,22 @@
     # Override PHP settings. More exist in sites/default/settings.php, but
     # the following cannot be changed at runtime. The first IfModule is
     # for Apache 1.3, the second for Apache 2.
+    # php4 module under Apache 1.3
     <IfModule mod_php4.c>
         php_value magic_quotes_gpc                0
         php_value register_globals                0
         php_value session.auto_start              0
         php_value memory_limit                  12M
     </IfModule>
+    # php5 module under Apache 1.3
+    <IfModule mod_php5.c>
+        php_value magic_quotes_gpc                0
+        php_value register_globals                0
+        php_value session.auto_start              0
+        php_value memory_limit                  12M
+    </IfModule>
 
+    # php under Apache 2.x module
     <IfModule sapi_apache2.c>
         php_value magic_quotes_gpc                0
         php_value register_globals                0
@@ -84,7 +91,12 @@
 #</Location>
 
 <Directory /var/lib/drupal>
-    allow from all
+    Allow from all
+    SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+    Options None
+    <IfModule mod_rewrite.c>
+        RewriteEngine off
+    </IfModule>
 </Directory>
 
 <VirtualHost *:80>
@@ -96,5 +108,3 @@
         Alias /files /var/lib/drupal
     </IfModule>
 </VirtualHost>
-
-# vim: filetype=apache ts=4 sw=4 et