X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=953e507dc1cbc374866ed5ad37ddb9664e4e183b;hb=d70f5f2a5fbe1993b16378be5f06288053336dbf;hp=20067de1f5e0de4da3ef16b4f6ba6ea3e3955f8d;hpb=42a5a96dd0c539135f2e1cb044a91f9e2f441f5f;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 20067de..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
@@ -22,49 +23,34 @@
   AddLanguage bg .bg
   AddLanguage ca .ca
   AddLanguage cs .cs
-  AddCharset ISO-8859-2 .cs
   AddLanguage da .da
-  AddCharset ISO-8859-1 .da
   AddLanguage de .de
   AddLanguage el .el
   AddLanguage eo .eo
   AddLanguage es .es
-  AddCharset ISO-8859-1 .es
   AddLanguage fi .fi
-  AddCharset ISO-8859-1 .fi
   AddLanguage fr .fr
   AddLanguage hr .hr
   AddLanguage hu .hu
-  AddCharset ISO-8859-2 .hu
   AddLanguage id .id
   AddLanguage it .it
-  AddCharset ISO-8859-1 .it
   AddLanguage ja .ja
-  AddCharset EUC_JP .ja
   AddLanguage ko .ko
   AddLanguage lt .lt
   AddLanguage nl .nl
-  AddCharset ISO-8859-1 .nl
   AddLanguage no .no
   AddLanguage nb .nb
   AddLanguage pl .pl
-  AddCharset ISO-8859-2 .pl
   AddLanguage pt .pt
-  AddCharset ISO-8859-1 .pt
   AddLanguage pt-pt .pt_PT
-  AddCharset ISO-8859-1 .pt_PT
   AddLanguage pt-br .pt_BR
-  AddCharset ISO-8859-1 .pt_BR
   AddLanguage ro .ro
   AddLanguage ru .ru
   AddLanguage sk .sk
-  AddCharset ISO-8859-2 .sk
   AddLanguage sl .sl
   AddLanguage sv .sv_SE
-  AddCharset ISO-8859-1 .sv_SE
   AddLanguage tr .tr
   AddLanguage uk .uk
-  AddCharset KOI8-U .uk
   AddLanguage zh-CN .zh-cn
   AddLanguage zh-HK .zh-hk
   AddLanguage zh-TW .zh-tw
@@ -86,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
@@ -124,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]
@@ -135,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]