X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=81a07a1929dc8bc4f1edc4a04ee152aee02b6f19;hb=f6a4eb4d0eb7078ffb261191abab23801e12db17;hp=be42f69eda8921f20f1950ca98e30bc4242d8c20;hpb=bfcd2cf1ea494a37e5c6ce31f6d3cdfc7fd26433;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index be42f69ed..81a07a192 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -31,8 +31,6 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     source: donizetti.debian.org:/srv/debdelta.debian.org/www/debdeltas
-    exclude-mirrors:
-      - busoni.debian.org
   dpl.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dpl.debian.org/htdocs
@@ -52,8 +50,11 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/micronews.debian.org/htdocs
   mirror-master.debian.org:
-    master: dillon.debian.org
+    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
     source: dillon.debian.org:/srv/news.debian.net/htdocs
@@ -95,10 +96,9 @@ components:
   onion.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/onion-master.debian.org/htdocs
-  apt.buildd.debian.org:
+  cdbuilder-logs.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: casulana.debian.org:/srv/cdbuilder.debian.org/dst/deb-cd/log
   10years.debconf.org   : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/10years.debconf.org' }
   debconf0.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf0.debconf.org' }
   debconf1.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf1.debconf.org' }
@@ -109,9 +109,14 @@ components:
   debconf6.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf6.debconf.org' }
   debconf7.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf7.debconf.org' }
   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' }
+  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.