From: Peter Palfrader Date: Tue, 9 Apr 2013 19:26:04 +0000 (+0200) Subject: Get rid of backports-master vhost on static X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ceee98c7f384f16e7a31474214515347e3bd187;p=dsa-puppet.git 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 9c6ecd19..94802696 100644 --- 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 - > - ServerName backports-master.debian.org - ServerAdmin debian-admin@debian.org - Redirect permanent / http://backports.debian.org/ - -# # 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. > 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/ -# vim:set syn=apache: # vim:ft=apache: