X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=7327825ce8558c05fc2df7aacc078a7a0e64a9ee;hb=35f621f8e5c89f97dbce23145fc8f03a2dd1f674;hp=eba66647e2b9b35d243e56f9445e64df864bc0d4;hpb=4fec9449ddf3d2a6162c05387367746f3e17e329;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index eba6664..7327825 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -72,6 +72,8 @@
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
+   CBandUser pdo
+
    Alias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry
@@ -111,13 +113,17 @@
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
    RewriteRule ^/favicon.ico$ - [L]
-
-#   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:([^/]+)$ /source/$1 [R,L,NE]
-   RewriteRule ^/file:(.+)$ http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+   RewriteRule ^/robots.txt$ - [L]
+
+   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]
 
    RewriteCond %{QUERY_STRING} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]