X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=8d15f70a4a1ad35cc62fde556c9a0e183e616244;hb=51de62135be26931ec3ce6bcdba86910310f0262;hp=7743e41ff4be3691f40f1db25481533b333d743b;hpb=b352992db741bd093396f87b5471bd732645a3a3;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7743e41ff..8d15f70a4 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,15 @@ 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
   debug_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -238,3 +242,33 @@ roles:
     - 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