Merge branch 'master' into debian-master

[deb/packages.git] / conf / apache.conf.sed.in

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 0eac5fa46572dddd3974cc1ea02198661f5d8ac5..00b38ad6b4b6772a09357b8198771ab45a07cc1e 100644 (file)
--- 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
@@ -80,10 +82,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
@@ -113,8 +112,8 @@
    RewriteRule ^/favicon.ico$ - [L]
    RewriteRule ^/robots.txt$ - [L]
 
-#   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$                     /index.html [L]
+   RewriteRule ^/$ http://www.debian.org/distrib/packages
+#   RewriteRule ^/$ /index.html [L]
    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
    RewriteRule ^/changelog:(.+)$       /changelogs/${changelog-url:$1} [R,L,NE]
    RewriteRule ^/src:([^/]+)$          /search?searchon=sourcenames&keywords=$1 [R,L,NE]