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 667ab16..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
@@ -84,11 +84,11 @@
 <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
@@ -98,7 +98,7 @@
 <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
@@ -110,7 +110,7 @@
    CacheNegotiatedDocs On
 
 # Custom Error
-   ErrorDocument 404 /errors/404
+   ErrorDocument 404 /devel/website/errors/404
 
 # the joys of backwards compatibility
    Redirect /cgi-bin/cvsweb http://cvs.debian.org