Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e59a088..6b13e5e 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -151,6 +151,7 @@ roles:
     - diabelli.debian.org
   # single sign on relying party (host) - also required apache2 module enabled on that host via other means
   sso_rp:
+    - debussy.debian.org
     - diabelli.debian.org
     - jerea.debian.org
     - nono.debian.org
@@ -240,9 +241,18 @@ roles:
     - vittoria.debian.org
   debian_mirror:
     - klecker.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
+    - mirror-bytemark.debian.org:
+        service-hostname: bytemark.debian.backend.mirrors.debian.org
+        listen-addresses:
+          - '5.153.231.45:80'
+          - '[2001:41c8:1000:21::21:45]:80'
+        fastly-backend: true
+    - mirror-accumu.debian.org:
+        service-hostname: accumu.debian.backend.mirrors.debian.org
+        fastly-backend: true
+    - mirror-skroutz.debian.org:
+        service-hostname: skroutz.debian.backend.mirrors.debian.org
+        fastly-backend: true
     - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
@@ -269,6 +279,8 @@ roles:
   ports_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
+  planet_master:
+    - philp.debian.org
   planet_search:
     - philp.debian.org
   i18n.d.o:
@@ -306,12 +318,19 @@ roles:
     - danzi.debian.org
     - fasolo.debian.org
     - melartin.debian.org
+    - sallinen.debian.org
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
   insecure_ssl:
+    - debussy.debian.org
     - godard.debian.org
   debsources:
     - sor.debian.org
+  ipsec:
+    - fasolo.debian.org
+    - storace.debian.org
+  debconf_wafer:
+    - debussy.debian.org