Accept www-*.d.o, fix typo

Signed-off-by: Peter Palfrader <peter@palfrader.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 a954a88..09f1597 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
@@ -88,7 +88,7 @@
    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 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