Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / roles / misc / static-components.yaml

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 3d08e68..c41bd31 100644 (file)
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -7,9 +7,6 @@ components:
   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
@@ -34,8 +31,6 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     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
@@ -105,6 +100,9 @@ components:
     master: dillon.debian.org
     source: wuiet.debian.org:/srv/buildd.debian.org/ftp-archive/archive
     limit-mirrors: [ 'klecker.debian.org', 'senfter.debian.org' ]
+  cdbuilder-logs.debian.org:
+    master: dillon.debian.org
+    source: casulana.debian.org:/srv/cdbuilder.debian.org/dst/deb-cd/log
   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' }