X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=hieradata%2Fcommon.yaml;h=e9a4d96e46877dffa0477adb612fff32402b0f2c;hb=bbf3d3e40605251cbd8e4d770d9666f924d1a756;hp=9748602603b5720da6ed8072be7b306c0baeba3a;hpb=843d7416696c2693410434a220900e88765e68bb;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 974860260..e9a4d96e4 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -17,6 +17,8 @@ root_mail_alias:
   - 'debian-admin@debian.org'
 paths:
   letsencrypt_dir: '/srv/puppet.debian.org/from-letsencrypt'
+  auto_certs_dir: '/srv/puppet.debian.org/ca/RESULT/certs'
+  auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -118,31 +120,42 @@ 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
     - lobos.debian.org
     - villa.debian.org
-  security_mirror_no_ftp:
-    # hosts that are not part of security.debian.org but
-    # only participiate in the anycast do not need ftp
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
-    - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
   security_upload:
@@ -155,6 +168,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
@@ -243,12 +257,34 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - klecker.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
-    - mirror-conova.debian.org
-    - mirror-isc.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:
+          - '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: 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
@@ -273,6 +309,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:
@@ -289,22 +327,8 @@ roles:
     - olin.debian.org
   experimental_apache:
     - cgi-grnet-01.debian.org
-    - coccia.debian.org
-    - klecker.debian.org
-    - manziarly.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
     - pejacevic.debian.org
     - petrova.debian.org
-    - philp.debian.org
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
-    - santoro.debian.org
-    - sechter.debian.org
-    - setoguchi.debian.org
-    - ticharich.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -324,10 +348,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