X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=42d9045ddd5043f9f1572a1e79d57460e788d134;hb=7d6e269f856bec92bc3cc44ea3d386069a9a7bab;hp=54bc42811abf59e7fc173232d9228116f4a728da;hpb=8416d17e9da55ff46b89e852eeb9174746895544;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 54bc42811..42d9045dd 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,7 +35,6 @@ roles:
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
-    - franck.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
     - usper.debian.org
@@ -54,13 +53,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:
@@ -68,9 +63,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:
@@ -116,7 +111,6 @@ roles:
     - santoro.debian.org
     - setoguchi.debian.org
     - sechter.debian.org
-    - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
   security_mirror_onion:
@@ -167,6 +161,7 @@ roles:
     - donizetti.debian.org
     - fasolo.debian.org
     - lindsay.debian.org
+    - manziarly.debian.org
     - mekeel.debian.org
     - porta.debian.org
     - philp.debian.org
@@ -212,6 +207,19 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
+  sreview.debian.org:
+    - vittoria.debian.org
+  debian_mirror:
+    - bilbao.debian.org
+    - boman.debian.org
+    - mirror-isc.debian.org
+  debian_mirror_onion:
+    - bilbao.debian.org
+    - mirror-isc.debian.org
+  historical_mirror:
+    - gretchaninov.debian.org
+    - klecker.debian.org
+    - sibelius.debian.org
   debug_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -234,9 +242,37 @@ 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
+  cdimage-search:
+    - cgi-grnet-01.debian.org