From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Jan 2014 15:55:06 +0000 (+0100)
Subject: Move dsa.d.o to static
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d30f0d07d1a24af0e7655712f69c501a5f40f284;p=mirror%2Fdsa-puppet.git

Move dsa.d.o to static
---

diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf
index a99b37d84..81823c78a 100644
--- a/modules/roles/files/static-mirroring/static-components.conf
+++ b/modules/roles/files/static-mirroring/static-components.conf
@@ -10,6 +10,7 @@ franck.debian.org	backports.debian.org		franck.debian.org	/srv/backports.debian.
 franck.debian.org	ftp-master.metadata.debian.org	franck.debian.org	/srv/ftp-master.debian.org/export
 dillon.debian.org	blends.debian.org		dillon.debian.org	/srv/blends.debian.org/www
 dillon.debian.org	d-i.debian.org			dillon.debian.org	/srv/d-i.debian.org/www
+dillon.debian.org	dsa.debian.org			dillon.debian.org	/srv/dsa.debian.org/htdocs
 dillon.debian.org	mozilla.debian.net		dillon.debian.org	/srv/mozilla.debian.net/htdocs
 dillon.debian.org	wnpp-by-tags.debian.net		dillon.debian.org	/srv/wnpp-by-tags.debian.net/www
 dillon.debian.org	www.ports.debian.org			dillon.debian.org	/srv/ports.debian.org/htdocs
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 eb9cd2fa1..6165aa8f6 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,6 +4,7 @@ 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 dsa.debian.org
 Use common-static-vhost-with-extra ftp-master.metadata.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"