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

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 2067d86..dfbefed 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -66,13 +66,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
@@ -108,6 +108,7 @@
    RewriteRule ^/changelogs/ - [L]
    RewriteRule ^/Pics/ - [L]
    RewriteRule ^/about/ - [L]
+   RewriteRule ^/ubuntu/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
    RewriteRule ^/favicon.ico$ - [L]
@@ -140,3 +141,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>
+