X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=dbd3e57229c39d2575394ae5aeea6c9d4876f562;hb=f594da2d06161d95234005ca642b3abd7cfeee6a;hp=4eaf9873f5a29126768dcde19980ce6dc0c1a983;hpb=d551cf8d994dbfe75b4406e512796544881ac714;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4eaf9873f..dbd3e5722 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,14 @@ 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-conova.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
@@ -163,12 +166,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 +215,23 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
+    # - klecker.debian.org
     - bilbao.debian.org
+    - boman.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
     - bilbao.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 +252,7 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
@@ -269,3 +284,6 @@ roles:
     - wieck.debian.org
   bgp:
     - bilbao.debian.org
+    - mirror-conova.debian.org
+  cdimage-search:
+    - cgi-grnet-01.debian.org