Finally get a working solution that handles both static and dynamic

pages correctly

diff --git a/conf/apache.conf b/conf/apache.conf
index 40c890d2432dfc2d675c2e626a8d338533189f3c..2ec164f7edaeaca9e5a7fc335c387896ae0b5294 100644 (file)
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -107,6 +107,17 @@
 
    # 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]
@@ -116,23 +127,11 @@
    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 %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
    RewriteRule ^/search/([^/]+)$ /cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=$1 [PT]
-
-   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 %{SCRIPT_FILENAME} "!-f"
-   RewriteCond %{SCRIPT_FILENAME} "!-d"
    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
 # 
 #   ErrorDocument 404 /index.html