X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=4457211e41e044f8444a20470a8371995df296ad;hb=e27616d54218beb6245161f3bc9d14e1d0619927;hp=ce7739f41c93e596ff668e7e6423e8de99093a70;hpb=0070886e14ac326eecd43f42730f604e2dfc0f28;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index ce7739f..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
 
@@ -81,10 +81,7 @@
    PerlSwitches -T
    <Location /cgi-bin/>
       SetHandler perl-script
-      # mod-perl etch
       PerlInitHandler Apache2::Reload
-      # mod-perl sarge
-      #PerlInitHandler Apache::Reload
       PerlHandler ModPerl::Registry
       Options +ExecCGI
       PerlSendHeader On
@@ -117,12 +114,13 @@
    RewriteRule ^/$ http://www.debian.org/distrib/packages
 #   RewriteRule ^/$ /index.html [L]
    RewriteRule ^/([^/+]*)([+])([^/]*)$	"/$1%%{%}2B$3" [N]
-   RewriteRule ^/changelog:(.+)$	http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
-   RewriteRule ^/src:([^/]+)$		http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
-   RewriteRule ^/file:(.+)$		http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
-   RewriteCond %{REQUEST_URI} !^/search$ [OR]
-   RewriteCond %{QUERY_STRING} ^$
-   RewriteRule ^/([^/]+)$		http://%SITE%/search?keywords=$1 [R,L,NE]
+   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 %{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} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]