X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf;h=d4bbb8b2541a7281b5b0597493e6ff95e5cb2e91;hb=0110c334d2e11b6d7c53e5c18dc13a7712b08340;hp=febd8d664a9df71afd00ff47451e669fd226e543;hpb=e3559dded9ba58d4e334ad08781a758231c036a0;p=deb%2Fpackages.git

diff --git a/conf/apache.conf b/conf/apache.conf
index febd8d6..d4bbb8b 100644
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -79,24 +79,51 @@
 <VirtualHost *>
    ServerAdmin webmaster@debian.org
    DocumentRoot /org/packages.debian.org/www/
-   ServerName packages.debian.org
+   ServerName packages.debian.net
    ErrorLog /var/log/apache/packages.debian.org-error.log
    CustomLog /var/log/apache/packages.debian.org-access.log combined
 
-   ScriptAlias /cgi-bin /org/packages.debian.org/cgi-bin/
+#   ScriptAlias /cgi-bin /org/packages.debian.org/cgi-bin/
+
+   Alias /cgi-bin/ /org/packages.debian.org/cgi-bin/
+  
+   PerlModule Apache::Registry
+   PerlTaintCheck On
+   <Location /cgi-bin/>
+      SetHandler perl-script
+      PerlRequire /org/packages.debian.org/bin/mod_perl-startup
+      PerlInitHandler Apache::Reload
+      PerlHandler Apache::Registry
+      Options +ExecCGI
+      PerlSendHeader On
+      allow from all
+   </Location>
+
+   ScriptAlias /cgi-old /org/packages.debian.net/cgi-bin/
 
    RewriteEngine on
+   RewriteLog /var/log/apache/rewrite.log
+   RewriteLogLevel 0
+
+   # we never want to rewrite those URLs
+   RewriteRule ^/cgi-(bin|old)/ - [L]
+   RewriteRule ^/Pics/ - [L]
+   RewriteRule ^/[^/]+\.css - [L]
+
+   RewriteCond %{DOCUMENT_ROOT}/%{SCRIPT_FILENAME} "-f"
+   RewriteRule ^. - [L]
 
-   RewriteRule ^/$ http://www.debian.org/distrib/packages
+   RewriteCond %{DOCUMENT_ROOT}/%{SCRIPT_FILENAME}.en.html "-f"
+   RewriteRule ^. - [L]
+
+   RewriteCond %{DOCUMENT_ROOT}/%{SCRIPT_FILENAME} "-d"
+   RewriteRule ^. - [L]
+
+#   RewriteRule ^/$ http://www.debian.org/distrib/packages
    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
-   RewriteRule ^/src:([^/]+)$ http://packages.debian.org/cgi-bin/search_packages.pl?searchon=sourcenames&version=all&exact=1&keywords=$1 [R,L,NE]
-   RewriteRule ^/file:(.+)$ http://packages.debian.org/cgi-bin/search_contents.pl?word=$1&searchmode=searchfiles [R,L,NE]
-   RewriteRule ^/dirs:(.+)$ http://packages.debian.org/cgi-bin/search_contents.pl?word=$1&searchmode=searchfilesanddirs [R,L,NE]
-   RewriteRule ^/word:(.+)$ http://packages.debian.org/cgi-bin/search_contents.pl?word=$1&searchmode=searchword [R,L,NE]
-   RewriteRule ^/list:([^/]+)$ http://packages.debian.org/cgi-bin/search_contents.pl?word=$1&searchmode=filelist [R,L,NE]
-   RewriteCond %{LA-U:SCRIPT_FILENAME} "!-f"
-   RewriteCond %{LA-U:SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/([^/]+)$ http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [R,L,NE]
+   RewriteRule ^/src:([^/]+)$ /search/source/$1 [R,L,NE]
+
+   RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [PT]
 
 #  In case we need to disable the site again
 #