Merge commit 'origin/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 e6cc7f6e0a2c8068c2b947e88b7d7ae80e02d854..fff631f5e4da0452f20913ae6ff37cd41fcdcad8 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -71,6 +71,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
@@ -110,8 +112,8 @@
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [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:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
    RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]