Move volatile vhost from www to static

[dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

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>