X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=232565eb5e403093160845b6211da9d7d05fc013;hb=bee06a193242a1de94f33fa31a32fa89a816222b;hp=9c6ecd1905b96463f5d8bb2ff48982d07aac13fd;hpb=f5aa9598cc51a64b70567e4b106565d46149a9b4;p=mirror%2Fdsa-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 9c6ecd190..232565eb5 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,17 +1,17 @@
# 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"
- >
- 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 +22,22 @@ 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:
+
+ >
+ 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/
+
# vim:ft=apache: