simplify

[dsa-puppet.git] / modules / roles / files / www_mirror / www.debian.org

diff --git a/modules/roles/files/www_mirror/www.debian.org b/modules/roles/files/www_mirror/www.debian.org
index 83e263fff4ba908f1dedca121988fb8869cb3173..d4007ca578795c247ee90e3566763c24bbfeac3c 100644 (file)
--- a/modules/roles/files/www_mirror/www.debian.org
+++ b/modules/roles/files/www_mirror/www.debian.org
@@ -89,7 +89,7 @@
 <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 debian.org www.debian.at www.debian.eu debian.eu
+   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com
    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
@@ -219,6 +219,7 @@
 
 <VirtualHost *:80>
    ServerName volatile.debian.org
+   ServerAlias volatile-master.debian.org
    ServerAdmin webmaster@debian.org
    ErrorLog /var/log/apache2/volatile.debian.org-error.log
    CustomLog /var/log/apache2/volatile.debian.org-access.log combined