X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=cdfd0454e63264a2dda773e405465c71b362faf1;hb=6c647a0d2c8dc3f9e5c4e70863aae8e3011038ea;hp=9bb3ea8c50f8e7bacd17b970996d9fa6c67a8e13;hpb=aed4553a3e2cdb43f83711429bd95cd8231de244;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 9bb3ea8c5..cdfd0454e 100644 --- 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,39 @@ # 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" - > - 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. + > + 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/ + + + + > + 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: