X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=aa68eaa7593c12f6f6504ef710c405560b9a030c;hb=d8428be3990c2b0a22a482da30e3c4b0902eaf41;hp=ac2143eb49400149d2f046136b43e94d3c544a57;hpb=fe72a688718c5f1bcd20fd7eee7276e0b15b8fa5;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index ac2143e..aa68eaa 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -8,10 +8,7 @@
 
   # Nice caching..
   ExpiresActive On
-  ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif  "modification plus 1 year"
-  ExpiresByType image/jpeg "modification plus 1 year"
-  ExpiresByType image/png  "modification plus 1 year"
+  ExpiresDefault "access plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -111,13 +108,17 @@
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
    RewriteRule ^/favicon.ico$ - [L]
+   RewriteRule ^/robots.txt$ - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$ /index.html [L]
-   RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
-   RewriteRule ^/changelog:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
-   RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
-   RewriteRule ^/file:(.+)$ http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+   RewriteRule ^/$			/index.html [L]
+   RewriteRule ^/([^/+]*)([+])([^/]*)$	"/$1%%{%}2B$3" [N]
+   RewriteRule ^/changelog:(.+)$	http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
+   RewriteRule ^/src:([^/]+)$		http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
+   RewriteRule ^/file:(.+)$		http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+   RewriteCond %{REQUEST_URI} !^/search$ [OR]
+   RewriteCond %{QUERY_STRING} ^$
+   RewriteRule ^/([^/]+)$		http://%SITE%/search?keywords=$1 [R,L,NE]
 
    RewriteCond %{QUERY_STRING} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]