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

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 819763f00..0f524c731 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -33,6 +33,9 @@ components:
     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
   dsa.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dsa.debian.org/htdocs
@@ -48,6 +51,12 @@ components:
   micronews.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/micronews.debian.org/htdocs
+  mirror-master.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
@@ -81,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
@@ -101,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' }