More gunking around to see if we can make this work

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a4a54ab..d59e2a7 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -120,20 +120,37 @@ roles:
   security_master:
     - seger.debian.org
   security_mirror:
-    - mirror-anu.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-conova.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
-    - lobos.debian.org
-    - santoro.debian.org
-    - setoguchi.debian.org
-    - sechter.debian.org
-    - villa.debian.org
-    - wieck.debian.org
+    - mirror-anu.debian.org:
+        fastly-backend: false
+    - mirror-bytemark.debian.org:
+        fastly-backend: false
+    - mirror-conova.debian.org:
+        fastly-backend: false
+    - mirror-csail.debian.org:
+        fastly-backend: false
+    - mirror-isc.debian.org:
+        fastly-backend: false
+    - mirror-umn.debian.org:
+        fastly-backend: false
+    - mirror-accumu.debian.org:
+        fastly-backend: false
+    - mirror-skroutz.debian.org:
+        fastly-backend: false
+    - lobos.debian.org:
+        service-hostname: lobos.security.backend.mirrors.debian.org
+        fastly-backend: true
+    - santoro.debian.org:
+        fastly-backend: false
+    - setoguchi.debian.org:
+        fastly-backend: false
+    - sechter.debian.org:
+        fastly-backend: false
+    - villa.debian.org:
+        service-hostname: villa.security.backend.mirrors.debian.org
+        fastly-backend: true
+    - wieck.debian.org:
+        service-hostname: wieck.security.backend.mirrors.debian.org
+        fastly-backend: true
   security_mirror_onion:
     - mirror-isc.debian.org
     - mirror-umn.debian.org
@@ -240,11 +257,12 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - klecker.debian.org
+    - klecker.debian.org:
         listen-addresses:
           - '130.89.148.12:80'
           - '[2001:610:1908:b000::148:12]:80'
           - '[2001:67c:2564:a119::148:12]:80'
+        fastly-backend: false
     - mirror-bytemark.debian.org:
         service-hostname: bytemark.debian.backend.mirrors.debian.org
         listen-addresses:
@@ -261,10 +279,12 @@ roles:
         listen-addresses:
           - '217.196.149.232:80'
           - '[2a02:16a8:dc41:100::232]:80'
+        fastly-backend: false
     - mirror-isc.debian.org:
         listen-addresses:
           - '149.20.4.15:80'
           - '[2001:4f8:1:c::15]:80'
+        fastly-backend: false
   debian_mirror_onion:
     - klecker.debian.org
     - mirror-bytemark.debian.org