The following commit has been merged in the debian-master branch:
commit 309fa47de537050d8a5c8a25f37d65f1668b29df
Merge: 7225f204a603002f4c3bc70b1a1eb94cbf638701
4aeff517035be3f0fdddeec04706a04811ce56fc
Author: Frank Lichtenheld <[email protected]>
Date: Sat Jan 31 20:27:52 2009 +0100
Merge branch 'master' into debian-master
diff --combined conf/apache.conf.sed.in
index a40858b,b0b33e3..4457211
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -65,11 -65,10 +65,11 @@@
AddEncoding x-gzip .gz
</Directory>
-<VirtualHost *>
+<VirtualHost *:80>
ServerAdmin [email protected]
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
+ ServerAlias packages-piatti.debian.org packages-powell.debian.org
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
@@@ -111,14 -110,15 +111,15 @@@
RewriteRule ^/favicon.ico$ - [L]
RewriteRule ^/robots.txt$ - [L]
-# RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index.html [L]
+ RewriteRule ^/$ http://www.debian.org/distrib/packages
+# 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} ^$
+ RewriteCond %{QUERY_STRING} ^$ [OR]
+ RewriteCond %{REQUEST_URI} !^/search$
+ RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
RewriteCond %{QUERY_STRING} =""
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
