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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b489b72e7..54bc42811 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -34,10 +34,11 @@ roles:
   ftp.d.o:
     - klecker.debian.org
   ftp_master:
+    - fasolo.debian.org
     - franck.debian.org
   ftp.upload.d.o:
-    - franck.debian.org
     - coccia.debian.org
+    - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
   dgit_browse:
@@ -78,7 +79,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -96,8 +97,6 @@ roles:
     - handel.debian.org
   qamaster:
     - quantz.debian.org
-  release:
-    - franck.debian.org
   rtmaster:
     - reger.debian.org
   rtc:
@@ -129,6 +128,7 @@ roles:
     - 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
@@ -139,9 +139,10 @@ 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
@@ -160,17 +161,18 @@ roles:
   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
@@ -210,12 +212,18 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
-  mirror_debug:
+  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:
     - philp.debian.org
   i18n.d.o:
@@ -230,3 +238,5 @@ roles:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
+  experimental_apache:
+    - draghi.debian.org