Get rid of backports-master vhost on static

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 9c6ecd1905b96463f5d8bb2ff48982d07aac13fd..94802696a99de78792f658b79f382a53711fe848 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,14 +4,8 @@ Use common-static-vhost mozilla.debian.net
 Use common-static-vhost bits.debian.org
 Use common-static-vhost backports.debian.org
 
-<Virtualhost <%= vhost_listen %> >
-       ServerName backports-master.debian.org
-       ServerAdmin debian-admin@debian.org
-       Redirect permanent / http://backports.debian.org/
-</VirtualHost>
-#
 # www.backports.org is the historical place for the backports
-# website and archive.  It is now a CNAME to backports.debian.org -
+# website and archive.  It is now a CNAME to backports.debian.org:
 # redirect http requests.
 <VirtualHost <%= vhost_listen %> >
        ServerName www.backports.org
@@ -22,6 +16,5 @@ Use common-static-vhost backports.debian.org
        RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
        RedirectPermanent / http://backports.debian.org/
 </VirtualHost>
-# vim:set syn=apache:
 
 # vim:ft=apache: