X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=569fab4175564245461bc55a9f201b4314262ee7;hb=e4588b11bfd3d7c536de20a19552732a4d6c51f7;hp=78bf0317d846812cba14cd491db17e168019119a;hpb=9c0a07c52dc8a2cfdbc7bef88f419a12f25cecd8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 78bf0317d..569fab417 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -13,6 +13,8 @@
 #       whitelist of mirrors ('limit-mirrors') that they should
 #       be synced to, thus excluding all others.
 #
+# Empty lists do not count.
+#
 # A mirrorrun for a component can only be triggered by its source
 # host and any hosts listed in that components "extra-push" list.
 
@@ -24,7 +26,7 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/network-test.debian.org/htdocs
   planet.debian.org:
-    master: dillon.debian.org
+    master: static-master-ubc-01.debian.org
     source: philp.debian.org:/srv/planet.debian.org/www
   www.debian.org:
     master: dillon.debian.org
@@ -36,7 +38,7 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/blends.debian.org/www
   bootstrap.debian.net:
-    master: dillon.debian.org
+    master: static-master-grnet-01.debian.org
     source: boott.debian.org:/srv/bootstrap.debian.net/htdocs
   d-i.debian.org:
     master: dillon.debian.org
@@ -54,10 +56,10 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dsa.debian.org/htdocs
   lintian.debian.org:
-    master: dillon.debian.org
+    master: static-master-ubc-01.debian.org
     source: lindsay.debian.org:/srv/lintian.debian.org/reports-directory/www
   manpages.debian.org:
-    master: manziarly.debian.org
+    master: static-master-ubc-01.debian.org
     source: manziarly.debian.org:/srv/manpages.debian.org/www
   mozilla.debian.net:
     master: dillon.debian.org
@@ -69,7 +71,7 @@ components:
     master: static-master-grnet-01.debian.org
     source: melartin.debian.org:/srv/mirror-team.debian.org/htdocs
     limit-mirrors:
-      - klecker.debian.org
+      - new-klecker.debian.org
       - mirror-isc.debian.org
   news.debian.net:
     master: dillon.debian.org
@@ -104,8 +106,6 @@ components:
   incoming.debian.org:
     master: fasolo.debian.org
     source: fasolo.debian.org:/srv/ftp-master.debian.org/public/incoming.debian.org/web
-    exclude-mirrors:
-      - klecker.debian.org
   metadata.ftp-master.debian.org:
     master: fasolo.debian.org
     source: fasolo.debian.org:/srv/ftp-master.debian.org/export
@@ -130,7 +130,6 @@ components:
   debconf16.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf16.debconf.org' }
   debconf17.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf17.debconf.org' }
   debconf18.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf18.debconf.org' }
-  debconf19.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf19.debconf.org' }
   es.debconf.org        : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/es.debconf.org' }
   fr.debconf.org        : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/fr.debconf.org' }
   miniconf10.debconf.org: { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/miniconf10.debconf.org' }