SOURCES: drupal.conf - default config is vhost based

[glen]

Author: glen                         Date: Thu Aug 18 16:14:22 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- default config is vhost based

---- Files affected:
SOURCES:
   drupal.conf (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/drupal.conf
diff -u SOURCES/drupal.conf:1.5 SOURCES/drupal.conf:1.6
--- SOURCES/drupal.conf:1.5	Wed Jul  6 18:49:28 2005
+++ SOURCES/drupal.conf	Thu Aug 18 18:14:17 2005
@@ -1,6 +1,10 @@
 #
-# Apache/PHP/Drupal settings:
+# Apache/PHP/Drupal settings.
+
+# Default setup is for running drupal in vhost.
+# You can setup drupal as alias /drupal, but you need to comment/uncomment few things.
 #
+# Please note that drupal-ID's don't work in subdirs, you need vhost for that.
 
 <Directory /usr/share/drupal/htdocs>
     Options FollowSymLinks
@@ -44,8 +48,8 @@
 
         # Modify the RewriteBase if you are using Drupal in a subdirectory and
         # the rewrite rules are not working properly.
-        # Comment it out if you have drupal configured in virtualhost root.
-        RewriteBase /drupal
+        # Enable RewriteBase if you have drupal configured in virtualhost root.
+        #RewriteBase /drupal
 
         # Rewrite old-style URLs of the form 'node.php?id=x'.
         #RewriteCond %{REQUEST_FILENAME} !-f
@@ -69,22 +73,25 @@
     ErrorDocument 404 /index.php
 </Directory>
 
-<IfModule mod_alias.c>
-    Alias /drupal /usr/share/drupal/htdocs
-</IfModule>
-
-# Comment out this block if you have drupal configured in virtualhost root.
-<Location /drupal>
-    # Customized error messages.
-    ErrorDocument 404 /drupal/index.php
-</Location>
+# If having drupal installed as /drupal
+#<IfModule mod_alias.c>
+#    Alias /drupal/files /var/lib/drupal
+#    Alias /drupal /usr/share/drupal/htdocs
+#</IfModule>
+#
+#<Location /drupal>
+#    # Customized error messages.
+#    ErrorDocument 404 /drupal/index.php
+#</Location>
+
+<VirtualHost *:80>
+    ServerName drupal
+    ServerAlias www.drupal
+    DocumentRoot /usr/share/drupal/htdocs
 
-# use something like this for vhost setup, and remember to disable Alias
-# /drupal and RewriteBase /drupal above.
-# Please note that drupal-ID's don't work in subdirs, you need vhost for that.
-#<VirtualHost *:80>
-#    ServerName drupal
-#    DocumentRoot /usr/share/drupal/htdocs
-#</VirtualHost>
+    <IfModule mod_alias.c>
+        Alias /files /var/lib/drupal
+    </IfModule>
+</VirtualHost>
 
 # vim: filetype=apache ts=4 sw=4 et
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/drupal.conf?r1=1.5&r2=1.6&f=u