X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=conf%2Fapache.conf.sed.in;h=953e507dc1cbc374866ed5ad37ddb9664e4e183b;hb=d70f5f2a5fbe1993b16378be5f06288053336dbf;hp=5f316e264c5d0522dee2a04f91a3a8875eac838a;hpb=ddd34c51549fc32d808c026b504095ff052ad8f8;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5f316e2..953e507 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -9,8 +9,9 @@
   # Nice caching..
   ExpiresActive On
   ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif "access plus 1 week"
-  ExpiresByType image/jpeg "access plus 1 week"
+  ExpiresByType image/gif  "modification plus 1 year"
+  ExpiresByType image/jpeg "modification plus 1 year"
+  ExpiresByType image/png  "modification plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -71,6 +72,8 @@
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
+   CBandUser pdo
+
    Alias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry
@@ -109,6 +112,7 @@
    RewriteRule ^/about/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
+   RewriteRule ^/favicon.ico$ - [L]
 
    RewriteRule ^/$ http://www.debian.org/distrib/packages
 #   RewriteRule ^/$ /index.html [L]
@@ -120,8 +124,7 @@
    RewriteCond %{QUERY_STRING} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
-   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l [OR]
-   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -d
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
    RewriteRule . - [L]
 
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]