- configure for directory for easy vhost or aliasing

Changed files:
    cowiki.conf -> 1.3

diff --git a/cowiki.conf b/cowiki.conf
index 5d22d2740ab77229ae78163b9318b14681f0433b..fd3f032a6e61233b75eee050c49888607ae10903 100644 (file)
--- a/cowiki.conf
+++ b/cowiki.conf
@@ -2,48 +2,43 @@
 
 <Directory /usr/share/cowiki/htdocs>
     Allow from all
+
+    #
+    # Values for PHP. If you are running PHP as CGI, set the values embeded
+    # in <IfModule mod_php...> directly in your php.ini configuration file.
+    #
+    <IfModule mod_php5.c>
+      php_value session.auto_start 0
+      php_value session.use_trans_sid 0
+    </IfModule>
+
+    #
+    # URL-Rewriting for coWiki. If you do not want to use this feature
+    # simply set the COWIKI_URL_REWRITE variable to "Off" and comment out
+    # the RewriteRule in the following line. Do not forget to delete all cache
+    # files (usually in /tmp/) *before* you re-request a coWiki script! Cached
+    # files will still contain rewritten links. This is also true for your
+    # session data, hence you must erase all session data manually.
+    #
+    <IfModule mod_rewrite.c>
+      RewriteEngine On
+
+      <IfModule mod_env.c>
+        SetEnv COWIKI_URL_REWRITE On
+        RewriteRule ^([0-9]+)\.html$ index.php?node=$1&%{QUERY_STRING}
+        RewriteRule ^([0-9]+)\.([0-9]+)\.html$ index.php?node=$1&comid=$2%{QUERY_STRING}
+      </IfModule>
+
+      #
+      # Handle WikiWord URLs
+      #
+      RewriteRule ^([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/*$ index.php?webname=$1&docname=$2&%{QUERY_STRING}
+      RewriteRule ^([A-Z0-9]+[A-Za-z0-9]*)/*$ index.php?webname=$1&%{QUERY_STRING}
+    </IfModule>
+
 </Directory>
 
 <VirtualHost *:80>
        ServerName cowiki
        DocumentRoot /usr/share/cowiki/htdocs
-
-# --- BEGIN: httpd configuration for coWiki -------------------------------
-
-#
-# Values for PHP. If you are running PHP as CGI, set the values embeded
-# in <IfModule mod_php...> directly in your php.ini configuration file.
-#
-<IfModule mod_php5.c>
-  php_value session.auto_start 0
-  php_value session.use_trans_sid 0
-</IfModule>
-
-#
-# URL-Rewriting for coWiki. If you do not want to use this feature
-# simply set the COWIKI_URL_REWRITE variable to "Off" and comment out
-# the RewriteRule in the following line. Do not forget to delete all cache
-# files (usually in /tmp/) *before* you re-request a coWiki script! Cached
-# files will still contain rewritten links. This is also true for your
-# session data, hence you must erase all session data manually.
-#
-<IfModule mod_rewrite.c>
-  RewriteEngine On
-
-  <IfModule mod_env.c>
-    SetEnv COWIKI_URL_REWRITE On
-    RewriteRule ^([0-9]+)\.html$ index.php?node=$1&%{QUERY_STRING}
-    RewriteRule ^([0-9]+)\.([0-9]+)\.html$ index.php?node=$1&comid=$2%{QUERY_STRING}
-  </IfModule>
-  
-  #
-  # Handle WikiWord URLs
-  #
-  RewriteRule ^([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/*$ index.php?webname=$1&docname=$2&%{QUERY_STRING}
-  RewriteRule ^([A-Z0-9]+[A-Za-z0-9]*)/*$ index.php?webname=$1&%{QUERY_STRING}    
-</IfModule>
-
-# --- END: httpd configuration for coWiki ---------------------------------
 </VirtualHost>
-
-# vim: filetype=apache ts=4 sw=4 et