From 6ccae12d02bc6728d7f716aacdd548f3add6933d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 10 Sep 2012 13:05:18 +0200
Subject: [PATCH] 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.

Signed-off-by: Don Armstrong <don@donarmstrong.com>
---
 debian/changelog     |  3 +++
 examples/apache.conf | 32 ++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 896a267..a7db9e0 100644
--- 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 298472b..62a24b9 100644
--- 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.*
-- 
2.39.2