X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=adaed409b15e60557b3a803057ce63b8ec9ad8f1;hb=02877fd7a80d851f757aa7d6ea19fa5f84c5d40e;hp=eb9cd2fa18961c78ea5f38456b6c9d0a8c69f2ee;hpb=737ee0fb8e0d6bea0d2efe6e584161d805f6f096;p=dsa-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 eb9cd2fa..adaed409 100644
--- 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/
+ >
+ ServerName volatile.debian.org
+ ServerAlias volatile-master.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://www.debian.org/volatile/
+
+
+ >
+ ServerName ftp-master.metadata.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://metadata.ftp-master.debian.org/
+
+
# vim:ft=apache: