Add blends and wnpp-by-tags

diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf
index 621215cbaaa0e1d08c840bec11eb02e6bdc243f9..bd772c5e439a8118ff0d8b733a752749b82dda55 100644 (file)
--- a/modules/roles/files/static-mirroring/static-components.conf
+++ b/modules/roles/files/static-mirroring/static-components.conf
@@ -1,5 +1,5 @@
 # puppetd maintained
-# <master> <service> <source host> <directory> <extra push hosts, comma separated>
+# <master>             <service>                       <source host>           <directory>                             <extra push hosts, comma separated>
 
 bizet.debian.org       mozilla.debian.net              moszumanska.debian.org  /srv/home/groups/pkg-mozilla/htdocs
 bizet.debian.org       planet.debian.org               philp.debian.org        /srv/planet.debian.org/www
@@ -9,4 +9,6 @@ bizet.debian.org        network-test.debian.org         master.debian.org       /srv/network-test.de
 bizet.debian.org       news.debian.net                 ravel.debian.org        /srv/news.debian.net/htdocs
 franck.debian.org      backports.debian.org            franck.debian.org       /srv/backports.debian.org/htdocs
 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      wnpp-by-tags.debian.net         dillon.debian.org       /srv/wnpp-by-tags.debian.net/www

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 bfb0008d3b03dd5198216096370e9fc92be4d61e..232565eb5e403093160845b6211da9d7d05fc013 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -7,6 +7,8 @@ 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 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"
 
 # www.backports.org is the historical place for the backports
 # website and archive.  It is now a CNAME to backports.debian.org: