X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=examples%2Fapache.conf;h=6232e035d3bd7d627cc507000328860cf4e04c69;hb=1fbaca61f2f551b5b2645ce2233a1d964bc93b30;hp=246149ff6d0227188c7aed4dddc1bf237ff76317;hpb=629c1d7d77fc28772a668d5c63794ae3cee08e03;p=debbugs.git

diff --git a/examples/apache.conf b/examples/apache.conf
index 246149f..6232e03 100644
--- 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
@@ -46,24 +32,18 @@
     # The following two redirect to up-to-date pages
     RewriteRule ^/[[:space:]]*#?([[:digit:]][[:digit:]][[:digit:]]+)([;&].+)?$ /cgi-bin/bugreport.cgi?bug=$1$2 [L,R,NE]
     RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
-    RewriteRule ^/[Ff][Rr][Oo][Mm]:([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?submitter=$1 [L,R,NE]
+    RewriteRule ^/[Ff][Rr][Oo][Mm]:([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?submitter=$1 [PT,NE]
     # Commented out, 'cuz aj says it will crash master. (old master)
     # RewriteRule ^/[Ss][Ee][Vv][Ee][Rr][Ii][Tt][Yy]:([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?severity=$1 [L,R]
-    RewriteRule ^/([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?maint=$1 [L,R,NE]
-    RewriteRule ^/mbox:([[:digit:]][[:digit:]][[:digit:]]+)([;&].+)?$ /cgi-bin/bugreport.cgi?mbox=yes&bug=$1$2 [L,R,NE]
-    RewriteRule ^/src:([^/]+)$ /cgi-bin/pkgreport.cgi?src=$1 [L,R,NE]
-    RewriteRule ^/severity:([^/]+)$ /cgi-bin/pkgreport.cgi?severity=$1 [L,R,NE]
-    RewriteRule ^/tag:([^/]+)$ /cgi-bin/pkgreport.cgi?tag=$1 [L,R,NE]
+    RewriteRule ^/([^/]+\@.+)$ /cgi-bin/pkgreport.cgi?maint=$1 [PT,NE]
+    RewriteRule ^/mbox:([[:digit:]][[:digit:]][[:digit:]]+)([;&].+)?$ /cgi-bin/bugreport.cgi?mbox=yes&bug=$1$2 [PT,NE]
+    RewriteRule ^/src:([^/]+)$ /cgi-bin/pkgreport.cgi?src=$1 [PT,NE]
+    RewriteRule ^/severity:([^/]+)$ /cgi-bin/pkgreport.cgi?severity=$1 [PT,NE]
+    RewriteRule ^/tag:([^/]+)$ /cgi-bin/pkgreport.cgi?tag=$1 [PT,NE]
     # 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>