Use a regular pipe to transport apt's output

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 9bb3ea8..370d713 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,12 +1,21 @@
 # puppet maintained
 
 Use common-static-vhost mozilla.debian.net
-Use common-static-vhost bits.debian.org
 Use common-static-vhost backports.debian.org
+Use common-static-vhost-publiclog bits.debian.org
+Use common-static-vhost ftp-master.metadata.debian.org
 
-<Virtualhost <%= vhost_listen %> >
-       ServerName backports-master.debian.org
+# www.backports.org is the historical place for the backports
+# website and archive.  It is now a CNAME to backports.debian.org:
+# redirect http requests.
+<VirtualHost <%= vhost_listen %> >
+       ServerName www.backports.org
+       ServerAlias lists.backports.org
        ServerAdmin debian-admin@debian.org
-       Redirect permanent / http://backports.debian.org/
+       RedirectPermanent /debian/           http://backports.debian.org/debian-backports/
+       RedirectPermanent /backports.org/    http://backports.debian.org/debian-backports/
+       RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
+       RedirectPermanent / http://backports.debian.org/
 </VirtualHost>
+
 # vim:ft=apache: