X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=ac2143eb49400149d2f046136b43e94d3c544a57;hb=6c89d8070adba05c8b39f529fba4fef517db4b80;hp=5ed7453f90da1c1a23357877b9a6825017c15347;hpb=47effee542c2d35e5956e225c94ba9046d54c4b8;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5ed7453..ac2143e 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,21 +72,21 @@
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
-   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry
    PerlTaintCheck On
-   PerlRequire %TOPDIR%/bin/mod_perl-startup
+#   PerlRequire %TOPDIR%/bin/mod_perl-startup
    PerlSwitches -T
    <Location /cgi-bin/>
-      SetHandler perl-script
+#      SetHandler perl-script
       # mod-perl etch
-      PerlInitHandler Apache2::Reload
+#      PerlInitHandler Apache2::Reload
       # mod-perl sarge
       #PerlInitHandler Apache::Reload
-      PerlHandler ModPerl::Registry
+#      PerlHandler ModPerl::Registry
       Options +ExecCGI
-      PerlSendHeader On
+#      PerlSendHeader On
       allow from all
    </Location>
 
@@ -109,6 +110,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 +122,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]