Only have one CGI-Script and move most of the code from the

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

diff --git a/conf/apache.conf b/conf/apache.conf
index 40c890d2432dfc2d675c2e626a8d338533189f3c..d4bbb8b2541a7281b5b0597493e6ff95e5cb2e91 100644 (file)
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -107,31 +107,23 @@
 
    # we never want to rewrite those URLs
    RewriteRule ^/cgi-(bin|old)/ - [L]
+   RewriteRule ^/Pics/ - [L]
+   RewriteRule ^/[^/]+\.css - [L]
 
-#   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
-   RewriteRule ^/src:([^/]+)$ http://packages.debian.net/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 %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [PT]
+   RewriteCond %{DOCUMENT_ROOT}/%{SCRIPT_FILENAME} "-f"
+   RewriteRule ^. - [L]
 
-   RewriteCond %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/search/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [PT]
+   RewriteCond %{DOCUMENT_ROOT}/%{SCRIPT_FILENAME}.en.html "-f"
+   RewriteRule ^. - [L]
 
-   RewriteCond %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/search/(.+)/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$2&path=$1 [PT]
+   RewriteCond %{DOCUMENT_ROOT}/%{SCRIPT_FILENAME} "-d"
+   RewriteRule ^. - [L]
 
-   RewriteCond %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
-   RewriteRule ^/(.+)/([^/]+)$ /cgi-bin/show_package.pl?searchon=names&version=all&exact=1&package=$2&path=$1 [PT]
+#   RewriteRule ^/$ http://www.debian.org/distrib/packages
+   RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+   RewriteRule ^/src:([^/]+)$ /search/source/$1 [R,L,NE]
 
+   RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [PT]
 
 #  In case we need to disable the site again
 #