X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=fb36e4a2b753cbb069bd5768e2a0f5a52a58f171;hp=2067d8608d57c4c2e4024c9be1b2b78e8a0ea585;hb=HEAD;hpb=6e07e823b19d4d708cbbf714dac7c8192fbbe018;ds=sidebyside

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 2067d86..fb36e4a 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,7 +65,7 @@
   AddEncoding x-gzip .gz
 </Directory>
 
-<VirtualHost *>
+<VirtualHost *:80>
    ServerAdmin webmaster@debian.org
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
@@ -80,10 +80,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
@@ -114,21 +111,23 @@
    RewriteRule ^/robots.txt$ - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$			/index.html [L]
+   RewriteRule ^/$			/index [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} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
    RewriteRule . - [L]
 
+   RewriteCond %{QUERY_STRING} ^$ [OR]
+   RewriteCond %{REQUEST_URI} !^/search$
+   RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+   RewriteRule ^/([^/]+)$		/search?keywords=$1 [R,L,NE]
+
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
 
 #  In case we need to disable the site again