X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=16aee4f4ced839d512195007cf36b653a201bd90;hb=e44a96b6508415fb4ed53c9c452a8d1b555e95af;hp=094eec88670c7929e4eb0f4bb31ed31177dc4c51;hpb=94a2405221354b24e14db3228db348c702031d7a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 094eec886..16aee4f4c 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
@@ -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: manziarly.debian.org
     source: manziarly.debian.org:/srv/manpages.debian.org/www
   mozilla.debian.net:
     master: dillon.debian.org
@@ -96,10 +114,9 @@ components:
   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
@@ -119,6 +136,8 @@ components:
   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' }
+  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.