X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=conf%2Fapache.conf.sed.in;h=c1fc18607b89874b1a57e2f2737a363be7bdc803;hb=fa9c56ffd5952da110ed11757fa82585f4bcae76;hp=8e8e2cc883e079edaa7bfdb71fab57e26bd39345;hpb=c883af946ec2cdf1b20a2fac5c532812fae1270f;p=deb%2Fpackages.git
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 8e8e2cc..c1fc186 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
@@ -79,10 +80,7 @@
PerlSwitches -T
SetHandler perl-script
- # mod-perl etch
PerlInitHandler Apache2::Reload
- # mod-perl sarge
- #PerlInitHandler Apache::Reload
PerlHandler ModPerl::Registry
Options +ExecCGI
PerlSendHeader On
@@ -110,13 +108,18 @@
RewriteRule ^/ubuntu/ - [L]
RewriteRule ^/[^/]+\.css - [L]
RewriteRule ^/[^/]+\.js - [L]
+ RewriteRule ^/favicon.ico$ - [L]
+ RewriteRule ^/robots.txt$ - [L]
# RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index.html [L]
- RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
- RewriteRule ^/changelog:(.+)$ http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
- RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
- RewriteRule ^/file:(.+)$ http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+ RewriteRule ^/$ /index.html [L]
+ RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+ RewriteRule ^/changelog:(.+)$ /changelogs/${changelog-url:$1} [R,L,NE]
+ RewriteRule ^/src:([^/]+)$ /search?searchon=sourcenames&keywords=$1 [R,L,NE]
+ RewriteRule ^/file:(.+)$ /search?searchon=contents&keywords=$1 [R,L,NE]
+ RewriteCond %{REQUEST_URI} !^/search$ [OR]
+ RewriteCond %{QUERY_STRING} ^$
+ RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
RewriteCond %{QUERY_STRING} =""
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
@@ -136,16 +139,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
+