X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=4088d28da2b362052a00272e8cb2db521160d8ac;hb=898ea78774b44c2023e8ea91869b3af23a82c416;hp=d8e4286cd514c9fbec5454361adea41723e9d771;hpb=69ddda6f521d4ef4ccc9d0fc551d512c0c7641f0;p=dsa-puppet.git

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 d8e4286c..4088d28d 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,6 +1,61 @@
 # 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"
 
+# 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
+	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:
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName www.debian-ports.org
+	ServerAlias debian-ports.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent /archive/           http://archive.ports.debian.org/archive/
+	RedirectPermanent /debian-cd/         http://archive.ports.debian.org/debian-cd/
+	RedirectPermanent /debian-snapshot/   http://archive.ports.debian.org/debian-snapshot/
+	RedirectPermanent /debian/            http://archive.ports.debian.org/debian/
+	RedirectPermanent / http://www.ports.debian.org/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ports.debian.net
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://www.ports.debian.org/
+</VirtualHost>