Extend examples/apache.conf, add directory rules. Esp. allow Indexes to be overridden...

Signed-off-by: Don Armstrong <don@donarmstrong.com>

diff --git a/debian/changelog b/debian/changelog
index 896a2675280f205c259f765173c628fff6688dbd..a7db9e0d97462aed515cebd1e9df681e6f8479a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     replace usage of src_url and pkg_url by package_links, use
     html_tail from templates, use count_bugs everywhere, load bugs.css,
     fix global variable usage in html header.
+  * Extend examples/apache.conf, add directory rules. Esp. allow Indexes to be
+    overridden in /var/lib/debbugs/www/db to allow mod_expires apache
+    configuration options in .htaccess.
 
  -- Don Armstrong <don@debian.org>  Wed, 25 Aug 2010 01:57:38 -0700
 

diff --git a/examples/apache.conf b/examples/apache.conf
index 298472bc04fa2c46313c870dd9393f56af6e02a3..62a24b92059e2f3ebe27d434280a6ba22268a243 100644 (file)
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,10 +1,34 @@
 <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/apache/debbugs-error.log
+    CustomLog /var/log/apache/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>
+
+    <Directory /var/lib/debbugs/www/db>
+        AllowOverride Indexes
+    </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.*