X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=conf%2Fapache.conf.sed.in;h=10e2521e23acfc8bea994f52afc45126e3baaa69;hb=214891c4361ffbae032f964ecdc0f114c63c9544;hp=8e8e2cc883e079edaa7bfdb71fab57e26bd39345;hpb=acce36b93fc8530fb50f50ca9edd08e6f6409b04;p=deb%2Fpackages.git
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 8e8e2cc..10e2521 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
@@ -110,6 +111,7 @@
RewriteRule ^/ubuntu/ - [L]
RewriteRule ^/[^/]+\.css - [L]
RewriteRule ^/[^/]+\.js - [L]
+ RewriteRule ^/favicon.ico$ - [L]
# RewriteRule ^/$ http://www.debian.org/distrib/packages
RewriteRule ^/$ /index.html [L]
@@ -136,16 +138,16 @@
-#
-# ServerAdmin frank@lichtenheld.de
-# DocumentRoot %TOPDIR%/www/
-# ServerName packages.ubuntu.net
-# ServerAlias packages.ubuntulinux.org
-# ErrorLog /var/log/apache2/%SITE%-error.log
-# CustomLog /var/log/apache2/%SITE%-access.log combined
-#
-# ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
-#
-# RedirectMatch permanent (.*) http://%SITE%$1
-#
+
+ ServerAdmin frank@lichtenheld.de
+ DocumentRoot %TOPDIR%/www/
+ ServerName packages.ubuntu.net
+ ServerAlias packages.ubuntulinux.org
+ ErrorLog /var/log/apache2/%SITE%-error.log
+ CustomLog /var/log/apache2/%SITE%-access.log combined
+
+ ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
+
+ RedirectMatch permanent (.*) http://%SITE%$1
+