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 45371007744cd3fc1c9635f8ee07cef157ddcc84..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
@@ -4,13 +4,17 @@ Use common-static-vhost mozilla.debian.net
 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 metadata.ftp-master.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"
+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.
@@ -25,6 +29,55 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
 </VirtualHost>
 
 
+# www.ports.debian.org
+######################
+<Virtualhost <%= vhost_listen %> >
+       ServerName www.ports.debian.org
+       ServerAlias www.ports-backend.debian.org
+       ServerAdmin debian-admin@lists.debian.org
+
+       ErrorLog /var/log/apache2/www.ports.debian.org-error.log
+       CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
+
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       ServerSignature On
+
+       DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur
+       <Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
+               AllowOverride FileInfo Indexes Options=Multiviews
+               Options Multiviews Indexes FollowSymLinks Includes
+               IndexOptions FancyIndexing NameWidth=*
+               Order allow,deny
+               Allow from all
+       </Directory>
+
+       DefaultType text/plain
+       AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+       AddOutputFilter INCLUDES .xhtml
+</VirtualHost>
+
+<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>
+
+# historical sites
+##################
+# now only redirects remain
 <VirtualHost <%= vhost_listen %> >
        ServerName women.debian.org
        ServerAdmin debian-admin@debian.org
@@ -41,22 +94,18 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
        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
+       ServerName volatile.debian.org
+       ServerAlias volatile-master.debian.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/
+       RedirectPermanent / http://www.debian.org/volatile/
 </VirtualHost>
 
 <VirtualHost <%= vhost_listen %> >
-       ServerName ports.debian.net
+       ServerName ftp-master.metadata.debian.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent /debian/            http://archive.ports.debian.org/debian/
-       RedirectPermanent / http://www.ports.debian.org/
+       RedirectPermanent / http://metadata.ftp-master.debian.org/
 </VirtualHost>
+
+# vim:ft=apache: