X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=0c3fcd9bbb995ecbcee675680e554f9c6b8d72a1;hb=408907f04911ac28607b64bfe55527c30e8fe212;hp=75a759ad0c80a33067dad6153983f63c623e332b;hpb=e35ca9ee88e46202339ae885d232aca681985381;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 75a759ad0..0c3fcd9bb 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -78,7 +78,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -100,16 +100,33 @@ roles:
     - 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
   sso:
@@ -143,12 +160,12 @@ roles:
   static_mirror_nopush:
     - dummy
   static_source:
+    - boott.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
     - franck.debian.org
     - lindsay.debian.org
-    - master.debian.org
     - mekeel.debian.org
     - porta.debian.org
     - philp.debian.org
@@ -193,10 +210,16 @@ 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
-  mirror_ports:
+  ports_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
   planet_search: