Move debian_mirror over to being a hash

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5538e58..311cefc 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -120,25 +120,39 @@ 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
-  security_mirror_onion:
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - lobos.debian.org
-    - villa.debian.org
+    mirror-anu.debian.org:
+      onion_v4_address: 150.203.164.61
+    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:
+      onion_v4_address: 149.20.4.14
+    mirror-umn.debian.org:
+      onion_v4_address: 128.101.240.215
+    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
+      onion_v4_address: 212.211.132.250
+    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
+      onion_v4_address: 212.211.132.32
+    wieck.debian.org:
+      service-hostname: wieck.security.backend.mirrors.debian.org
+      fastly-backend: true
   security_tracker:
     - soriano.debian.org
   security_upload:
@@ -240,34 +254,35 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - 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:
-          - '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:
-        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
+    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:
+        - '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:
+      service-hostname: conova.debian.backend.mirrors.debian.org
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      fastly-backend: true
+    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