X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=dcbb1e560925d50338f974b7efc4af80fa59c5b5;hb=74b848186ff77f1247370d033d9e7e8806193317;hp=5de94d16a6f51415a900ecb89ec4455a1375d2ef;hpb=fc6022006bbaa1b617c5df4a0c185902b7948c1a;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5de94d16a..dcbb1e560 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -34,10 +34,10 @@ roles:
   ftp.d.o:
     - klecker.debian.org
   ftp_master:
-    - franck.debian.org
+    - fasolo.debian.org
   ftp.upload.d.o:
-    - franck.debian.org
     - coccia.debian.org
+    - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
   dgit_browse:
@@ -53,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:
@@ -78,7 +74,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -96,22 +92,38 @@ roles:
     - handel.debian.org
   qamaster:
     - quantz.debian.org
-  release:
-    - franck.debian.org
   rtmaster:
     - reger.debian.org
-  security_master:
-    - seger.debian.org
-  security_tracker:
-    - soriano.debian.org
   rtc:
     - vogler.debian.org
   search_backend:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
+  security_master:
+    - seger.debian.org
+  security_mirror:
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - lobos.debian.org
+    - santoro.debian.org
+    - setoguchi.debian.org
+    - sechter.debian.org
+    - steffani.debian.org
+    - villa.debian.org
+    - wieck.debian.org
+  security_mirror_onion:
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - lobos.debian.org
+    - villa.debian.org
+  security_tracker:
+    - soriano.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
+    - usper.debian.org
   sso:
     - diabelli.debian.org
   # single sign on relying party (host) - also required apache2 module enabled on that host via other means
@@ -122,9 +134,11 @@ roles:
     - quantz.debian.org
     - tate.debian.org
     - ticharich.debian.org
+    - wilder.debian.org
   static_master:
     - dillon.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
+    - porta.debian.org
   static_mirror:
     - busoni.debian.org
     - klecker.debian.org
@@ -133,19 +147,27 @@ roles:
     - mirror-isc.debian.org
     - senfter.debian.org
     - santoro.debian.org
+  static_mirror_onion:
+    - busoni.debian.org
+    - klecker.debian.org
+    - mirror-isc.debian.org
+    - senfter.debian.org
   # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
   static_mirror_nopush:
     - dummy
   static_source:
+    - boott.debian.org
+    - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
     - lindsay.debian.org
-    - master.debian.org
     - mekeel.debian.org
+    - porta.debian.org
     - philp.debian.org
     - respighi.debian.org
     - wolkenstein.debian.org
+    - wuiet.debian.org
   syncproxy:
     - klecker.debian.org
     - milanollo.debian.org
@@ -185,7 +207,18 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
-  mirror_debug:
+  sreview.debian.org:
+    - vittoria.debian.org
+  debug_mirror:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  debug_mirror_onion:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  ports_mirror:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  ports_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
   planet_search:
@@ -198,3 +231,25 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
+  ports-master:
+    - porta.debian.org
+  onionbalance:
+    - olin.debian.org
+  experimental_apache:
+    - beach.debian.org
+    - busoni.debian.org
+    - draghi.debian.org
+    - klecker.debian.org
+    - lobos.debian.org
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - picconi.debian.org
+    - pkgmirror-csail.debian.org
+    - santoro.debian.org
+    - sechter.debian.org
+    - senfter.debian.org
+    - setoguchi.debian.org
+    - villa.debian.org
+    - wieck.debian.org