X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmisc%2Fstatic-components.yaml;h=95f5bebfbdc1ff4c95d67d96c5c002e7d7bc598c;hb=f193c7a7e138b0a25b0b306cde3c54b12858fe58;hp=c41bd3157eaf24155b4bf548e3ce78d96a1ea92e;hpb=4fa00c924213011c7aaf780177423fef776ee069;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index c41bd3157..95f5bebfb 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -96,10 +96,9 @@ components:
   onion.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/onion-master.debian.org/htdocs
-  apt.buildd.debian.org:
+  openpgpkey.debian.org:
     master: dillon.debian.org
-    source: wuiet.debian.org:/srv/buildd.debian.org/ftp-archive/archive
-    limit-mirrors: [ 'klecker.debian.org', 'senfter.debian.org' ]
+    source: kaufmann.debian.org:/srv/keyring.debian.org/openpgpkey
   cdbuilder-logs.debian.org:
     master: dillon.debian.org
     source: casulana.debian.org:/srv/cdbuilder.debian.org/dst/deb-cd/log
@@ -115,9 +114,12 @@ 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' }
+  wiki.debconf.org      : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/wiki.debconf.org' }
+  www.debconf.org       : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/www.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.