Merge branch 'master' into ubuntu-master

Conflicts:
	templates/config/mirrors.tmpl

diff --combined conf/apache.conf.sed.in
index c1fc18607b89874b1a57e2f2737a363be7bdc803,b0b33e3fbb5c309ce35df5a65ca4bb53a3c220fa..9c7430c0b3cc639cc6a8969246a14353be902f95
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -66,13 -66,13 +66,13 @@@
  </Directory>
  
  <VirtualHost *>
 -   ServerAdmin webmaster@debian.org
 +   ServerAdmin frank@lichtenheld.de
     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 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>
 +