X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=493c07cc4273cef9d330775c9b7806017e4125ef;hb=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=caa88e6db1c83a82e528537c20ff5bbc7e6c809b;hpb=ae12805e08a316f760deeca9da889b66feccf2ca;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index caa88e6db..493c07cc4 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -3,10 +3,13 @@
 components:
   bits.debian.org:
     master: dillon.debian.org
-    source: master.debian.org:/srv/bits-master.debian.org/htdocs
+    source: dillon.debian.org:/srv/bits-master.debian.org/htdocs
   network-test.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/network-test.debian.org/htdocs
+  planet.debian.net:
+    master: dillon.debian.org
+    source: dillon.debian.org:/srv/planet.debian.net/htdocs
   planet.debian.org:
     master: dillon.debian.org
     source: philp.debian.org:/srv/planet.debian.org/www
@@ -19,6 +22,9 @@ components:
   blends.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/blends.debian.org/www
+  bootstrap.debian.net:
+    master: dillon.debian.org
+    source: boott.debian.org:/srv/bootstrap.debian.net/htdocs
   d-i.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/d-i.debian.org/www
@@ -28,18 +34,30 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     source: donizetti.debian.org:/srv/debdelta.debian.org/www/debdeltas
+  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
   lintian.debian.org:
     master: dillon.debian.org
     source: lindsay.debian.org:/srv/lintian.debian.org/reports-directory/www
+  manpages.debian.org:
+    master: dillon.debian.org
+    source: manziarly.debian.org:/srv/manpages.debian.org/www
   mozilla.debian.net:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/mozilla.debian.net/htdocs
-  micronews.debian.net:
-    master: dillon.debian.org
-    source: dillon.debian.org:/srv/micronews.debian.net/htdocs
+  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
@@ -68,17 +86,23 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/timeline.debian.net/htdocs
   backports.debian.org:
-    master: franck.debian.org
-    source: franck.debian.org:/srv/backports.debian.org/htdocs
+    master: dillon.debian.org
+    source: coccia.debian.org:/srv/backports.debian.org/htdocs
   incoming.debian.org:
-    master: franck.debian.org
-    source: franck.debian.org:/srv/ftp-master.debian.org/public/incoming.debian.org/web
+    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: franck.debian.org
-    source: franck.debian.org:/srv/ftp-master.debian.org/export
+    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:
+    master: dillon.debian.org
+    source: wuiet.debian.org:/srv/buildd.debian.org/ftp-archive/archive
+    limit-mirrors: [ 'klecker.debian.org', 'senfter.debian.org' ]
   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' }
@@ -88,6 +112,9 @@ components:
   debconf5.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf5.debconf.org' }
   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' }