X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=10e2521e23acfc8bea994f52afc45126e3baaa69;hb=62b2941b9f0ff5ed647ecbba800f1c671577c2bd;hp=b69afe2da48ca0b900f38e7b4db5919ec1f4fcf4;hpb=3cf32c32f93178b8645cb641b57e24c724e6cc13;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index b69afe2..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
@@ -73,19 +74,19 @@
 
    ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
-#   PerlModule ModPerl::Registry
-#   PerlTaintCheck On
-#   PerlRequire %TOPDIR%/bin/mod_perl-startup
-#   PerlSwitches -T
+   PerlModule ModPerl::Registry
+   PerlTaintCheck On
+   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>
 
@@ -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 @@
 
 </VirtualHost>
 
-#<VirtualHost *>
-#   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
-#</VirtualHost>
+<VirtualHost *>
+   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
+</VirtualHost>