X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=bf0ccdd9ca2f8b1b9a7a0ea6cb0576d641317423;hb=14dbe81b92fcbc6ca8328d8fb39293761297b4bf;hp=ad8b0956a3f01db4cdda387f9383bf3ed404c7c8;hpb=67db5724b6dd3c1e629dfe0be5db20821ffcc0f7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index ad8b0956a..bf0ccdd9c 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -3,7 +3,7 @@
 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
@@ -19,6 +19,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,6 +31,8 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     source: donizetti.debian.org:/srv/debdelta.debian.org/www/debdeltas
+    exclude-mirrors:
+      - busoni.debian.org
   dsa.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dsa.debian.org/htdocs
@@ -37,9 +42,21 @@ components:
   mozilla.debian.net:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/mozilla.debian.net/htdocs
+  micronews.debian.org:
+    master: dillon.debian.org
+    source: dillon.debian.org:/srv/micronews.debian.org/htdocs
   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
+  release.debian.org:
+    master: dillon.debian.org
+    source: respighi.debian.org:/srv/release.debian.org/www
+  release.debian.org-pu:
+    master: dillon.debian.org
+    source: coccia.debian.org:/srv/release.debian.org/www/proposed-updates
   rtc.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/rtc.debian.org/htdocs
@@ -56,14 +73,20 @@ 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: fasolo.debian.org
+    source: fasolo.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
   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
   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' }
@@ -73,6 +96,7 @@ 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' }
   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' }