Add fasolo as ftp-master

[mirror/dsa-puppet.git] / hieradata / common.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5c7f1a8..9b9b8a6 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -34,6 +34,7 @@ roles:
   ftp.d.o:
     - klecker.debian.org
   ftp_master:
+    - fasolo.debian.org
     - franck.debian.org
   ftp.upload.d.o:
     - franck.debian.org
@@ -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:
@@ -120,6 +119,11 @@ roles:
     - 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:
@@ -155,12 +159,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
@@ -205,10 +209,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: