X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=examples%2Fapache.conf;h=7ed13c626f621425e947d8d9ea41404cd29db678;hb=f7ee8422f2cf386f3eecc26cc46d58eb220fbbbc;hp=62a24b92059e2f3ebe27d434280a6ba22268a243;hpb=6ccae12d02bc6728d7f716aacdd548f3add6933d;p=debbugs.git

diff --git a/examples/apache.conf b/examples/apache.conf
index 62a24b9..7ed13c6 100644
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,33 +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
+	    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
@@ -53,13 +43,7 @@
     # RewriteMap fix-chars	int:noescape
     RewriteCond %{REQUEST_URI} ^/(Access\.html|Developer\.html|Reporting\.html|server-request\.html|server-control\.html|server-refcard\.html).* [NC]
     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>
+    # PT|passthrough to bugreport.cgi and pkgreport.cgi
+    RewriteRule ^/([0-9]+)$ /cgi-bin/bugreport.cgi?bug=$1 [PT,NE]
+    RewriteRule ^/([^/]+)$ /cgi-bin/pkgreport.cgi?pkg=$1 [PT,NE]
 </VirtualHost>