X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=e94ef9b9bf35c7f6e7513ae9a42d17bcfe47f021;hb=48cf1d7f51154072c1648b9f34453eb93a83e9ea;hp=286172ef575fd3d7a6b8301453b1487d8c45c70e;hpb=945f3f42f8b921e6432fbbd6b97dfd482b58a3b8;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 286172ef5..e94ef9b9b 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
@@ -53,13 +52,9 @@ roles:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone:
-    - oyens.debian.org
   keystone_rabbitmq:
     - rainier.debian.org
     - rapoport.debian.org
-  memcached:
-    - oyens.debian.org
   lists:
     - bendel.debian.org
   list_search:
@@ -67,9 +62,9 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
-  manpages:
-    - glinka.debian.org
+  manpages-dyn:
     - manziarly.debian.org
+    - cgi-grnet-01.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -115,7 +110,6 @@ roles:
     - santoro.debian.org
     - setoguchi.debian.org
     - sechter.debian.org
-    - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
   security_mirror_onion:
@@ -166,7 +160,9 @@ roles:
     - donizetti.debian.org
     - fasolo.debian.org
     - lindsay.debian.org
+    - manziarly.debian.org
     - mekeel.debian.org
+    - melartin.debian.org
     - porta.debian.org
     - philp.debian.org
     - respighi.debian.org
@@ -213,6 +209,20 @@ roles:
     - vittoria.debian.org
   sreview.debian.org:
     - vittoria.debian.org
+  debian_mirror:
+    # - klecker.debian.org
+    - bilbao.debian.org
+    - boman.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-isc.debian.org
@@ -235,23 +245,38 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
   experimental_apache:
+    - beach.debian.org
     - busoni.debian.org
+    - cgi-grnet-01.debian.org
+    - coccia.debian.org
     - draghi.debian.org
     - klecker.debian.org
     - lobos.debian.org
+    - manziarly.debian.org
+    - milanollo.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
+    - pejacevic.debian.org
+    - petrova.debian.org
+    - philp.debian.org
+    - picconi.debian.org
     - pkgmirror-csail.debian.org
     - santoro.debian.org
     - sechter.debian.org
     - senfter.debian.org
     - setoguchi.debian.org
+    - ticharich.debian.org
     - villa.debian.org
     - wieck.debian.org
+  bgp:
+    - bilbao.debian.org
+    - mirror-conova.debian.org
+  cdimage-search:
+    - cgi-grnet-01.debian.org