The following commit has been merged in the ubuntu-master branch:
commit 9786e970292c154845a5f5dbc3086191ea59a6f0
Merge: aa2e0fe2326ca54e2cc46959968ba6234f105e25
4aeff517035be3f0fdddeec04706a04811ce56fc
Author: Frank Lichtenheld <[email protected]>
Date: Sat Jan 31 20:29:32 2009 +0100
Merge branch 'master' into ubuntu-master
Conflicts:
templates/config/mirrors.tmpl
diff --combined conf/apache.conf.sed.in
index c1fc186,b0b33e3..9c7430c
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -66,13 -66,13 +66,13 @@@
</Directory>
<VirtualHost *>
- ServerAdmin [email protected]
+ ServerAdmin [email protected]
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
- Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+ ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
PerlTaintCheck On
@@@ -105,7 -105,6 +105,7 @@@
RewriteRule ^/changelogs/ - [L]
RewriteRule ^/Pics/ - [L]
RewriteRule ^/about/ - [L]
+ RewriteRule ^/ubuntu/ - [L]
RewriteRule ^/[^/]+\.css - [L]
RewriteRule ^/[^/]+\.js - [L]
RewriteRule ^/favicon.ico$ - [L]
@@@ -117,8 -116,9 +117,9 @@@
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} =""
@@@ -138,17 -138,3 +139,17 @@@
# RewriteRule . /index.html
</VirtualHost>
+
+<VirtualHost *>
+ ServerAdmin [email protected]
+ 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>
+
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
