X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=0f524c731bceef6792deab5c5b7ee1640adf395d;hb=a02b7a339535bbe2769a4d111daa2eccdc11f28a;hp=fcdd33f5a96244a22026b6d7def63bdd1379b99b;hpb=3c6303312627c8662f12ca1431e81c12186847f9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index fcdd33f5a..0f524c731 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -52,16 +52,17 @@ 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
   incoming.ports.debian.org:
     master: porta.debian.org
     source: porta.debian.org:/srv/ports-master.debian.org/queue/accepted
-    exclude-mirrors:
-      - klecker.debian.org
   release.debian.org:
     master: dillon.debian.org
     source: respighi.debian.org:/srv/release.debian.org/www
@@ -89,6 +90,8 @@ 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
@@ -109,6 +112,8 @@ 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' }
   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' }