X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=4457211e41e044f8444a20470a8371995df296ad;hb=e27616d54218beb6245161f3bc9d14e1d0619927;hp=bb6c21fbe386515eda54f5559660a4a2200a1c49;hpb=c5021513a3bf129c3179ee2edad4b3e18b6103a7;p=deb%2Fpackages.git diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index bb6c21f..4457211 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -69,7 +69,7 @@ ServerAdmin webmaster@debian.org DocumentRoot %TOPDIR%/www/ ServerName %SITE% - ServerAlias newpackages.debian.org + ServerAlias packages-piatti.debian.org packages-powell.debian.org ErrorLog /var/log/apache2/%SITE%-error.log CustomLog /var/log/apache2/%SITE%-access.log combined @@ -117,8 +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} =""