X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=2c4770a528e53ed6e78d5bb545c87c885596b29b;hb=65110a2992a5e87b1142c71b9528ad84f6d47a61;hp=6285cf07256ddb64416d5ed3f9ad43833eb71cdc;hpb=b2beaa2e46cb51673b185c54db94871a9843a425;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 6285cf072..2c4770a52 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -2,13 +2,13 @@
 
 components:
   bits.debian.org:
-    master: bizet.debian.org
-    source: master.debian.org:/srv/bits-master.debian.org/htdocs
+    master: dillon.debian.org
+    source: dillon.debian.org:/srv/bits-master.debian.org/htdocs
   network-test.debian.org:
-    master: bizet.debian.org
-    source: master.debian.org:/srv/network-test.debian.org/htdocs
+    master: dillon.debian.org
+    source: dillon.debian.org:/srv/network-test.debian.org/htdocs
   planet.debian.org:
-    master: bizet.debian.org
+    master: dillon.debian.org
     source: philp.debian.org:/srv/planet.debian.org/www
   www.debian.org:
     master: dillon.debian.org
@@ -19,6 +19,9 @@ components:
   blends.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/blends.debian.org/www
+  boostrap.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 +31,32 @@ 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
   lintian.debian.org:
     master: dillon.debian.org
-    source: lindsay.debian.org:/srv/lintian.debian.org/www
+    source: lindsay.debian.org:/srv/lintian.debian.org/reports-directory/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
   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
@@ -64,10 +81,30 @@ components:
   metadata.ftp-master.debian.org:
     master: franck.debian.org
     source: franck.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
+  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' }
+  debconf2.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf2.debconf.org' }
+  debconf3.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf3.debconf.org' }
+  debconf4.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf4.debconf.org' }
+  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' }
+  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.
 mirrors:
   mirror-anu.debian.org:
     components-include: # all others are thus excluded
       - www.debian.org
+  santoro.debian.org:
+    components-include: # all others are thus excluded
+      - www.debian.org