X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=conf%2Fapache.conf;h=5c1248c52eda6bbc54e4152ef48bbc48971143cb;hb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;hp=40c890d2432dfc2d675c2e626a8d338533189f3c;hpb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1;p=deb%2Fpackages.git

diff --git a/conf/apache.conf b/conf/apache.conf
index 40c890d..5c1248c 100644
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -70,7 +70,7 @@
   AddLanguage zh-TW .zh-tw
   LanguagePriority en fr de it es ja pl hr da pt pt-pt pt-br fi zh-cn zh-hk zh-tw cs sv sv-se ko no nb ru tr uk eo ar nl hu ro sk el ca en-us en-gb id lt sl bg
 
-  DirectoryIndex index index.html index.shtml index.htm
+  DirectoryIndex index
 
   # RSS stuff
   AddType application/rss+xml .rdf .xml
@@ -103,35 +103,27 @@
 
    RewriteEngine on
    RewriteLog /var/log/apache/rewrite.log
-   RewriteLogLevel 0
+   RewriteLogLevel 9
 
    # 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
 #