X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ffiles%2Fwww_mirror%2Fwww.debian.org;h=d4007ca578795c247ee90e3566763c24bbfeac3c;hb=312ad2929debb23b0e5e93534bb90621bff234dc;hp=c9b60489b84a5856ce14c74babf8ffee871786f3;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/www_mirror/www.debian.org b/modules/roles/files/www_mirror/www.debian.org
index c9b60489b..d4007ca57 100644
--- 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
@@ -215,3 +215,13 @@
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
 
 </VirtualHost>
+
+
+<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
+   RedirectMatch permanent . http://www.debian.org/volatile/
+</VirtualHost>