X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=8d54dd8ed0e18e193544398cf64bc7e319187059;hb=5a6ab1f3e3b79df87c63891606044f4d617c67c3;hp=36e328e70bc0be85fc4df9c88e05ae3db1425ae1;hpb=035afc8ec0d9b85c97d1a35a2b6a86fafb910dea;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 36e328e70..8d54dd8ed 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,6 +4,8 @@ searchpaths: []
 resolvoptions: []
 allow_dns_query: []
 roles:
+  archive_master:
+    - sibelius.debian.org
   bugsmx:
     - buxtehude.debian.org
   bugs_master:
@@ -65,6 +67,9 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
+  manpages:
+    - glinka.debian.org
+    - manziarly.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -74,6 +79,7 @@ roles:
   packages:
     - picconi.debian.org
     - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -95,16 +101,33 @@ roles:
     - franck.debian.org
   rtmaster:
     - reger.debian.org
-  security_master:
-    - seger.debian.org
-  security_tracker:
-    - soriano.debian.org
   rtc:
     - vogler.debian.org
   search_backend:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
+  security_master:
+    - seger.debian.org
+  security_mirror:
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - lobos.debian.org
+    - santoro.debian.org
+    - setoguchi.debian.org
+    - sechter.debian.org
+    - steffani.debian.org
+    - villa.debian.org
+    - wieck.debian.org
+  security_mirror_onion:
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - lobos.debian.org
+    - villa.debian.org
+  security_tracker:
+    - soriano.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
   sso:
@@ -114,36 +137,47 @@ roles:
     - diabelli.debian.org
     - jerea.debian.org
     - nono.debian.org
-    - ticharich.debian.org
+    - quantz.debian.org
     - tate.debian.org
+    - ticharich.debian.org
   static_master:
     - dillon.debian.org
     - franck.debian.org
+    - porta.debian.org
   static_mirror:
     - busoni.debian.org
     - klecker.debian.org
-    - senfter.debian.org
+    - mirror-anu.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
-    - mirror-anu.debian.org
+    - senfter.debian.org
+    - santoro.debian.org
+  static_mirror_onion:
+    - busoni.debian.org
+    - klecker.debian.org
+    - mirror-isc.debian.org
+    - senfter.debian.org
   # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
   static_mirror_nopush:
     - dummy
   static_source:
-    - master.debian.org
+    - boott.debian.org
+    - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
     - franck.debian.org
     - lindsay.debian.org
     - mekeel.debian.org
+    - porta.debian.org
     - philp.debian.org
+    - respighi.debian.org
     - wolkenstein.debian.org
   syncproxy:
+    - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
-    - klecker.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -153,19 +187,20 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
-    - gluck.debian.org
+    - busoni.debian.org
+    - klecker.debian.org
     - mirror-anu.debian.org
-    - mirror-isc.debian.org
     - mirror-csail.debian.org
+    - mirror-isc.debian.org
     - mirror-umn.debian.org
     - santoro.debian.org
-    - busoni.debian.org
-    - klecker.debian.org
     - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:
     - wolkenstein.debian.org
+  cgi.d.o:
+    - wolkenstein.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
@@ -176,8 +211,29 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
-  mirror_debug:
+  debug_mirror:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  debug_mirror_onion:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  ports_mirror:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  ports_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
   planet_search:
     - philp.debian.org
+  i18n.d.o:
+    - tye.debian.org
+  l10n.d.o:
+    - tye.debian.org
+  dedup.d.n:
+    - delfin.debian.org
+  pet.d.n:
+    - petrova.debian.org
+  ports-master:
+    - porta.debian.org
+  onionbalance:
+    - olin.debian.org