X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=f980c6d37b9b15d68ef187205b818cb040f2d76e;hb=53b3217b7d9cfb135b06ecd39075b00bb58944b2;hp=601e5cf18486fbc2fd999419e655b598bf005d76;hpb=186b13bbe5f9cfe1a8a58ddb860e4c9c49903320;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 601e5cf18..f980c6d37 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
@@ -28,18 +28,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,6 +78,9 @@ 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' }
@@ -73,13 +90,18 @@ 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' }
+  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