X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=f3f39e5dd403c34d854471c2b74a7fbeed695c5a;hb=387dbef4074648d702a1d6c600585d85e4316f2f;hp=a217891f1f604831b9aaf86652dd6a1a4bc51932;hpb=4be74ac01981e7d3ee7aecf601594274eab8dd86;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a217891f1..f3f39e5dd 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,8 +4,6 @@ searchpaths: []
 resolvoptions: []
 allow_dns_query: []
 roles:
-  archive_master:
-    - sibelius.debian.org
   bugsmx:
     - buxtehude.debian.org
   bugs_master:
@@ -32,6 +30,7 @@ roles:
   extranrpeclient:
     - denis.debian.org
   ftp.d.o:
+    # also see debian_mirror
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
@@ -100,10 +99,15 @@ roles:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
+  archvsync_base_additional:
+  # this is usually pulled in by *-mirror or syncproxy roles
+    - dummy
   security_master:
     - seger.debian.org
   security_mirror:
     - mirror-anu.debian.org
+    - mirror-bytemark.debian.org
+    - mirror-conova.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
@@ -118,6 +122,10 @@ roles:
     - mirror-umn.debian.org
     - lobos.debian.org
     - villa.debian.org
+  security_mirror_no_ftp:
+    # hosts that are not part of security.debian.org but
+    # only participiate in the anycast do not need ftp
+    - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
   ssh.upload.d.o:
@@ -163,12 +171,14 @@ roles:
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
+    - melartin.debian.org
     - porta.debian.org
     - philp.debian.org
     - respighi.debian.org
     - wolkenstein.debian.org
     - wuiet.debian.org
   syncproxy:
+    - gretchaninov.debian.org
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
@@ -210,13 +220,24 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - bilbao.debian.org
+    - klecker.debian.org
+    - mirror-bytemark.debian.org
+    - boman.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
-    - bilbao.debian.org
+    - klecker.debian.org
+    - mirror-bytemark.debian.org
     - mirror-isc.debian.org
+  historical_master:
+    - sibelius.debian.org
+  historical_mirror:
+    - gretchaninov.debian.org
+    - klecker.debian.org
+    - sibelius.debian.org
   debug_mirror:
     - klecker.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
   debug_mirror_onion:
     - klecker.debian.org
@@ -237,7 +258,7 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
@@ -268,7 +289,7 @@ roles:
     - villa.debian.org
     - wieck.debian.org
   bgp:
-    - bilbao.debian.org
-    - boman.debian.org
+    - mirror-bytemark.debian.org
+    - mirror-conova.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org