X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=34be32052b0dcbe30d7539e51142f547899ff8f5;hb=9b15e921b57a1866cd826fa5edb889efc2c3c843;hp=95f5bebfbdc1ff4c95d67d96c5c002e7d7bc598c;hpb=535db036c2f77823b4b68efe4989bea51dc212d2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 95f5bebfb..34be32052 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -1,5 +1,23 @@
 --- 
 
+# By default, each component is put onto every static node.
+#
+# However, exceptions are caused as follows:
+#   - Individual mirrors can set a 'components-include' list.
+#       A mirror that has a components-include list will mirror
+#       exactly those components.
+#   - Individual components can exclude themselves from
+#       being pushed to individual mirrors by setting
+#       an 'exclude-mirrors' list.
+#   - Alternatively, individual components can provide a
+#       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.
+
 components:
   bits.debian.org:
     master: dillon.debian.org
@@ -20,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
@@ -41,7 +59,7 @@ components:
     master: dillon.debian.org
     source: lindsay.debian.org:/srv/lintian.debian.org/reports-directory/www
   manpages.debian.org:
-    master: dillon.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
@@ -53,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
@@ -88,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
@@ -114,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' }