Merge remote-tracking branch 'don/master' into pindy/docs

[debbugs.git] / examples / apache.conf

diff --git a/examples/apache.conf b/examples/apache.conf
index 246149ff6d0227188c7aed4dddc1bf237ff76317..0c1315d18c674ac853e25f6809fbabf6e61e68e9 100644 (file)
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,37 +1,23 @@
+# -*- mode: apache; -*-
 <VirtualHost *>
     ServerName bugs.debian.org
     ServerAdmin owner@bugs.debian.org
     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>
+    ErrorLog /var/log/apache2/debbugs-error.log
+    CustomLog /var/log/apache2/debbugs-access.log combined
 
     <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>
-
-    <Directory /var/lib/debbugs/www/txt>
-        Options +Indexes
+           Options Indexes SymLinksIfOwnerMatch MultiViews
+           DirectoryIndex index.en.html
+           Require all granted
     </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
+        Options ExecCGI SymLinksIfOwnerMatch
+           Require all granted
     </Directory>
 
     RewriteEngine on
@@ -59,11 +45,4 @@
     RewriteRule .* - [L]
     RewriteRule ^/([0-9]+)$ /cgi-bin/bugreport.cgi?bug=$1 [L,R,NE]
     RewriteRule ^/([^/]+)$ /cgi-bin/pkgreport.cgi?pkg=$1 [L,R,NE]
-    <IfModule mod_perl.c>
-       <Directory /org/bugs.debian.org/cgi-bin/sql>
-           SetHandler  perl-script
-           PerlHandler Apache::Registry
-           Options +ExecCGI
-       </Directory>
-    </IfModule>
 </VirtualHost>