Comment/reorganize static-vhosts-simple

[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 562dbaa033e4ff8069d33ce5e034a6b255c545db..cbf4c6bff368d242556016cd928c45f390be3988 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -11,8 +11,10 @@ Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend
 Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
 Use common-static-vhost-ssl dsa.debian.org
 Use common-static-vhost-ssl rtc.debian.org
-Use common-static-vhost security-team.debian.org "ServerAlias security-team-backend.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 security-team.debian.org "ServerAlias security-team-back
 </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>
-
-# debian ports stuff
-####################
+# www.ports.debian.org
+######################
 <Virtualhost <%= vhost_listen %> >
        ServerName www.ports.debian.org
        ServerAlias www.ports-backend.debian.org
@@ -90,6 +75,26 @@ Use common-static-vhost security-team.debian.org "ServerAlias security-team-back
        RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+# historical sites
+##################
+# now only redirects remain
+<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>
+
 <VirtualHost <%= vhost_listen %> >
        ServerName volatile.debian.org
        ServerAlias volatile-master.debian.org