Add ports.d.o to static

[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 9bb3ea8c50f8e7bacd17b970996d9fa6c67a8e13..5f4293488220626f84a3c77b56f71929a6966e91 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,44 @@
 # 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 news.debian.net
+Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8"
+Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
+Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
+Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
+Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
+Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-backend.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>
+
+
+<VirtualHost <%= vhost_listen %> >
+       ServerName women.debian.org
+       ServerAdmin debian-admin@debian.org
+
+       RedirectPermanent / http://www.debian.org/women/
+
+       RedirectPermanent /about/ http://www.debian.org/women/about
+       RedirectPermanent /contact/ http://www.debian.org/women/contact
+       RedirectPermanent /faqs/ http://www.debian.org/women/faq
+       RedirectPermanent /home/ http://www.debian.org/women/
+       RedirectPermanent /images/dw.png http://www.debian.org/women/dw.png
+       RedirectPermanent /involvement/ http://www.debian.org/women/participate
+       RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring
+       RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
+       RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
 </VirtualHost>
 # vim:ft=apache: