X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=807a3c7c3eba1009eb20618bfac540da1d2e242c;hb=489765c975281e4d065b8bf215c49edae5d979d3;hp=ce443127a54c7ec8337abf7b5db0977bb1a8f4ce;hpb=c64d2c7c8a811fae933898a2bc712dbd9beb01fc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index ce443127a..807a3c7c3 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
@@ -31,6 +49,10 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     source: donizetti.debian.org:/srv/debdelta.debian.org/www/debdeltas
+    limit-mirrors:
+      - mirror-csail.debian.org
+      - mirror-isc.debian.org
+      - senfter.debian.org
   dpl.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dpl.debian.org/htdocs
@@ -41,7 +63,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: manziarly.debian.org
     source: manziarly.debian.org:/srv/manpages.debian.org/www
   mozilla.debian.net:
     master: dillon.debian.org
@@ -53,7 +75,6 @@ components:
     master: static-master-grnet-01.debian.org
     source: melartin.debian.org:/srv/mirror-team.debian.org/htdocs
     limit-mirrors:
-      - klecker.debian.org
       - mirror-isc.debian.org
   news.debian.net:
     master: dillon.debian.org
@@ -88,18 +109,15 @@ 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
   onion.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/onion-master.debian.org/htdocs
-  apt.buildd.debian.org:
+  openpgpkey.debian.org:
     master: dillon.debian.org
-    source: wuiet.debian.org:/srv/buildd.debian.org/ftp-archive/archive
-    limit-mirrors: [ 'klecker.debian.org', 'senfter.debian.org' ]
+    source: kaufmann.debian.org:/srv/keyring.debian.org/openpgpkey
   cdbuilder-logs.debian.org:
     master: dillon.debian.org
     source: casulana.debian.org:/srv/cdbuilder.debian.org/dst/deb-cd/log
@@ -120,6 +138,7 @@ components:
   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' }
   wiki.debconf.org      : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/wiki.debconf.org' }
+  www.debconf.org       : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/www.debconf.org' }
   deb.debian.org        : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/deb.debian.org/htdocs' }
 
 # The list of mirrors comes from puppet's hieradata.  This is just to set some arguments for specific mirrors.