planet static master is now ubc

[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 807a3c7..473beac 100644 (file)
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -26,7 +26,7 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/network-test.debian.org/htdocs
   planet.debian.org:
-    master: dillon.debian.org
+    master: static-master-ubc-01.debian.org
     source: philp.debian.org:/srv/planet.debian.org/www
   www.debian.org:
     master: dillon.debian.org
@@ -38,7 +38,7 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/blends.debian.org/www
   bootstrap.debian.net:
-    master: dillon.debian.org
+    master: static-master-grnet-01.debian.org
     source: boott.debian.org:/srv/bootstrap.debian.net/htdocs
   d-i.debian.org:
     master: dillon.debian.org
@@ -49,10 +49,6 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     source: donizetti.debian.org:/srv/debdelta.debian.org/www/debdeltas
-    limit-mirrors:
-      - mirror-csail.debian.org
-      - mirror-isc.debian.org
-      - senfter.debian.org
   dpl.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dpl.debian.org/htdocs
@@ -63,7 +59,7 @@ components:
     master: dillon.debian.org
     source: lindsay.debian.org:/srv/lintian.debian.org/reports-directory/www
   manpages.debian.org:
-    master: manziarly.debian.org
+    master: static-master-ubc-01.debian.org
     source: manziarly.debian.org:/srv/manpages.debian.org/www
   mozilla.debian.net:
     master: dillon.debian.org
@@ -75,6 +71,7 @@ components:
     master: static-master-grnet-01.debian.org
     source: melartin.debian.org:/srv/mirror-team.debian.org/htdocs
     limit-mirrors:
+      - new-klecker.debian.org
       - mirror-isc.debian.org
   news.debian.net:
     master: dillon.debian.org
@@ -133,7 +130,6 @@ components:
   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' }
-  debconf19.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf19.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' }