Merge commit 'origin/master' into ubuntu-master

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

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5ed7453f90da1c1a23357877b9a6825017c15347..8e8e2cc883e079edaa7bfdb71fab57e26bd39345 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,13 +65,13 @@
 </Directory>
 
 <VirtualHost *>
-   ServerAdmin webmaster@debian.org
+   ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
-   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry
    PerlTaintCheck On
@@ -107,6 +107,7 @@
    RewriteRule ^/changelogs/ - [L]
    RewriteRule ^/Pics/ - [L]
    RewriteRule ^/about/ - [L]
+   RewriteRule ^/ubuntu/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
 
@@ -120,8 +121,7 @@
    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 [OR]
-   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -d
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
    RewriteRule . - [L]
 
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
@@ -135,3 +135,17 @@
 #   RewriteRule . /index.html
 
 </VirtualHost>
+
+#<VirtualHost *>
+#   ServerAdmin frank@lichtenheld.de
+#   DocumentRoot %TOPDIR%/www/
+#   ServerName packages.ubuntu.net
+#   ServerAlias packages.ubuntulinux.org
+#   ErrorLog /var/log/apache2/%SITE%-error.log
+#   CustomLog /var/log/apache2/%SITE%-access.log combined
+#
+#   ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
+#
+#   RedirectMatch permanent (.*) http://%SITE%$1
+#</VirtualHost>
+