X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=fb7d0cee9e38f32d5620c526ad1491b9bc768edf;hb=6e92a4c26c55a0c9ecfa84973edfb849bab8b770;hp=a40858b549f8054198854d8bb0b13bcfea9268e2;hpb=174f75eac881f7157ea8791d36491e5d5ba71225;p=deb%2Fpackages.git diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index a40858b..fb7d0ce 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 packages-piatti.debian.org packages-powell.debian.org + ServerAlias packages-piatti.debian.org packages-powell.debian.org packages-rore.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} =""