X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=conf%2Fapache.conf.sed.in;h=10e2521e23acfc8bea994f52afc45126e3baaa69;hb=214891c4361ffbae032f964ecdc0f114c63c9544;hp=4c0c90754e5a5bf7ff62961a1dbcd8b7d783390a;hpb=7fe3c9b50d2de32cf6abd9cb3aa0744d8600aeda;p=deb%2Fpackages.git
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 4c0c907..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
-# 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
@@ -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]
@@ -121,8 +123,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]
@@ -136,3 +137,17 @@
# RewriteRule . /index.html
+
+
+ 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
+
+