setup-dchroot: merge from tor (genname split into function, ubuntu updates)

[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 f1d3535..094eec8 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
@@ -118,6 +115,7 @@ 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' }