Make it more obvious what are static strings and what are parameters

[deb/packages.git] / conf / apache.conf

diff --git a/conf/apache.conf b/conf/apache.conf
index f6e9e03bf95a1601f08c8cdd6e0626c4a03329b3..2ec164f7edaeaca9e5a7fc335c387896ae0b5294 100644 (file)
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -102,9 +102,22 @@
    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]
@@ -114,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
 #