From da0708b0299bb96910822eef24feaaee5426f3c8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 22 Jul 2014 21:14:20 +0200 Subject: [PATCH] Comment/reorganize static-vhosts-simple --- .../vhost/static-vhosts-simple.erb | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) 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 c052d8bb..cbf4c6bf 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -13,6 +13,8 @@ Use common-static-vhost-ssl dsa.debian.org Use common-static-vhost-ssl rtc.debian.org Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org" +# www.backports.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. @@ -27,25 +29,8 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit - > - 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/ - - -# debian ports stuff -#################### +# www.ports.debian.org +###################### > ServerName www.ports.debian.org ServerAlias www.ports-backend.debian.org @@ -90,6 +75,26 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit RedirectPermanent / http://www.ports.debian.org/ +# historical sites +################## +# now only redirects remain + > + 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/ + + > ServerName volatile.debian.org ServerAlias volatile-master.debian.org -- 2.39.2