add www.debian.at to catch-all

[mirror/dsa-puppet.git] / modules / apache2 / files / common / etc / apache2 / sites-available / www.debian.org

diff --git a/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org b/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
index 879be66..37f2517 100644 (file)
--- a/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
+++ b/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
@@ -1,5 +1,10 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 # Need to turn on negotiation_module
-<Directory /org/www.debian.org/www/>
+<Directory /srv/www.debian.org/www/>
   Options +MultiViews +FollowSymLinks +Indexes
   AddHandler type-map var
   # Make sure that the srm.conf directive is commented out.
@@ -79,20 +84,21 @@
 <VirtualHost *:80>
    ServerName www.nl.debian.org
    ServerAdmin webmaster@debian.org
-   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net
+   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at
    DocumentRoot /srv/www.debian.org/www/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log combined
-   RewriteLog /var/log/apache2/www-other.debian.org-recirect.log
+   RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
+   RewriteLogLevel 1
 
    RewriteEngine on
-   RewriteRule ^(.*)$ http://www.debian.org/$1 [R=301,L]
+   RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:80>
    ServerName www.debian.org
    ServerAdmin webmaster@debian.org
-   ServerAlias debian.org www-staging.debian.org
+   ServerAlias www-*.debian.org
    DocumentRoot /srv/www.debian.org/www/
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log combined
@@ -103,6 +109,9 @@
    # this behavior, and proxies will be allowed to cache the documents.
    CacheNegotiatedDocs On
 
+# Custom Error
+   ErrorDocument 404 /devel/website/errors/404
+
 # the joys of backwards compatibility
    Redirect /cgi-bin/cvsweb http://cvs.debian.org
    Redirect /Lists-Archives http://lists.debian.org