use + for symlinks and multiviews; newer apache doesn't like it otherwise

[debbugs.git] / examples / apache.conf

diff --git a/examples/apache.conf b/examples/apache.conf
index 298472bc04fa2c46313c870dd9393f56af6e02a3..479c35098f86a651b39c09c6c19cea27737bc54c 100644 (file)
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,10 +1,30 @@
 <VirtualHost *>
     ServerName bugs.debian.org
     ServerAdmin owner@bugs.debian.org
-    DocumentRoot /org/bugs.debian.org/www/
-    ScriptAlias /cgi-bin /org/bugs.debian.org/cgi-bin
-    ErrorLog /var/log/apache/bugs.debian.org-error.log
-    CustomLog /var/log/apache/bugs.debian.org-access.log combined
+    DocumentRoot /var/lib/debbugs/www/
+
+    ErrorLog /var/log/apache2/debbugs-error.log
+    CustomLog /var/log/apache2/debbugs-access.log combined
+
+    <Directory />
+        Options FollowSymLinks
+        AllowOverride None
+    </Directory>
+
+    <Directory /var/lib/debbugs/www>
+        Options -Indexes +FollowSymLinks +MultiViews
+        AllowOverride Options
+        Order allow,deny
+        allow from all
+    </Directory>
+
+    ScriptAlias /cgi-bin/ /var/lib/debbugs/www/cgi/
+    <Directory "/var/lib/debbugs/www/cgi/">
+        AllowOverride None
+        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+        Order allow,deny
+        Allow from all
+    </Directory>
 
     RewriteEngine on
     RewriteCond %{HTTP_USER_AGENT}     .*apt-listbugs.*