X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=examples%2Fapache.conf;h=9800c044ef71e13432606b874fc3b9d2cb662df5;hb=4086d7e915413170b69822a8b7e0ad80f3919b72;hp=e322c0fbdca8ce8e162c62f0fbae8c345aaeaa5d;hpb=adaf8c69a212872936909b22ae7ee2b115ef6fde;p=debbugs.git

diff --git a/examples/apache.conf b/examples/apache.conf
index e322c0f..9800c04 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/apache2/debbugs-error.log
+    CustomLog /var/log/apache2/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/txt>
+        Options +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.*
@@ -13,7 +37,7 @@
     #  RewriteLog /org/bugs.debian.org/apache-rewrite.log
     #  RewriteLogLevel 0
      
-    RewriteRule ^/$ http://www.debian.org/Bugs/
+    #RewriteRule ^/$ http://www.debian.org/Bugs/
     RewriteRule ^/(robots\.txt|release-critical|apt-listbugs\.html)$ - [L]
     # The following two redirect to up-to-date pages
     RewriteRule ^/[[:space:]]*#?([[:digit:]][[:digit:]][[:digit:]]+)([;&].+)?$ /cgi-bin/bugreport.cgi?bug=$1$2 [L,R,NE]
@@ -27,6 +51,9 @@
     RewriteRule ^/severity:([^/]+)$ /cgi-bin/pkgreport.cgi?severity=$1 [L,R,NE]
     RewriteRule ^/tag:([^/]+)$ /cgi-bin/pkgreport.cgi?tag=$1 [L,R,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>