rename ftp-master.metadata to metadata.ftp-master

[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 eb9cd2fa18961c78ea5f38456b6c9d0a8c69f2ee..adaed409b15e60557b3a803057ce63b8ec9ad8f1 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,11 +4,12 @@ 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-ssl dsa.debian.org
 
 # www.backports.org is the historical place for the backports
 # website and archive.  It is now a CNAME to backports.debian.org:
@@ -87,4 +88,17 @@ Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-
        RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+       ServerName volatile.debian.org
+       ServerAlias volatile-master.debian.org
+       ServerAdmin debian-admin@debian.org
+       RedirectPermanent / http://www.debian.org/volatile/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+       ServerName ftp-master.metadata.debian.org
+       ServerAdmin debian-admin@debian.org
+       RedirectPermanent / http://metadata.ftp-master.debian.org/
+</VirtualHost>
+
 # vim:ft=apache: