Move volatile vhost from www to static

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 7775d96856bd78ae793c4106607029891874ac83..a4a4e8dc2cbfdc0b8f8b9466acf9caba65ad1255 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -245,13 +245,3 @@
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
 
 </VirtualHost>
-
-
-<VirtualHost <%= vhost_listen %> >
-   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 privacy
-   RedirectMatch permanent . http://www.debian.org/volatile/
-</VirtualHost>

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 1da1eb5985a6ee938221efd4525c45cec475c7ce..672726a00a8cb8433063fedc891ecf6eb9f44b68 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -88,4 +88,11 @@ Use common-static-vhost-ssl dsa.debian.org
        RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+       ServerName volatile.debian.org
+       ServerAlias volatile-master.debian.org
+       ServerAdmin debian-admin@debian.org
+       RedirectPermanent / http://www.debian.org/volatile/
+</VirtualHost>
+
 # vim:ft=apache: