X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=4165bb9f1eda77d1e2a08196543865996343c7ca;hb=7484a3adc951c00fd18c530bb88007b5d4632808;hp=c1fc18607b89874b1a57e2f2737a363be7bdc803;hpb=fa9c56ffd5952da110ed11757fa82585f4bcae76;p=deb%2Fpackages.git diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index c1fc186..4165bb9 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -65,10 +65,11 @@ AddEncoding x-gzip .gz - + ServerAdmin frank@lichtenheld.de DocumentRoot %TOPDIR%/www/ ServerName %SITE% + ServerAlias packages.ubunut.com ErrorLog /var/log/apache2/%SITE%-error.log CustomLog /var/log/apache2/%SITE%-access.log combined @@ -117,8 +118,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} ="" @@ -139,7 +141,7 @@ - + ServerAdmin frank@lichtenheld.de DocumentRoot %TOPDIR%/www/ ServerName packages.ubuntu.net