X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=conf%2Fapache.conf;h=2ec164f7edaeaca9e5a7fc335c387896ae0b5294;hp=0fce69bf838199bbb00e8aab7753d13bc7bd8412;hb=bbe90f9136f133811370f0d3c58a96c7ee2dc795;hpb=7c013fa416a5457f6c745f38f6e83af0aad7f9bb

diff --git a/conf/apache.conf b/conf/apache.conf
index 0fce69b..2ec164f 100644
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -83,13 +83,41 @@
    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]
+
+   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]
@@ -99,14 +127,10 @@
    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 %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/([^/]+)$ http://packages.debian.net/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [R,L,NE]
-
-   RewriteCond %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/(.+)/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$2&path=$1 [PT]
-
+   RewriteRule ^/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [PT]
+   RewriteRule ^/search/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [PT]
+   RewriteRule ^/search/(.+)/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$2&path=$1 [PT]
+   RewriteRule ^/(.+)/([^/]+)$ /cgi-bin/show_package.pl?searchon=names&version=all&exact=1&package=$2&path=$1 [PT]
 
 #  In case we need to disable the site again
 #