X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=abb603fbaeef6f1d2baac3162f988aadb0d86e33;hb=7932e84592f4fc6b7670104e9aebef3edd007890;hp=9a6071ae2e8c04c4bacc04f75e2a51ea4ebfa569;hpb=065597c8bfe0f8b59e4354172e725f539ebe5d40;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 9a6071ae2..abb603fba 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -13,6 +13,12 @@ samhain_recipients:
   - 'weasel@debian.org'
   - 'steve@lobefin.net'
   - 'zumbi@oron.es'
+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
@@ -69,6 +75,8 @@ roles:
   manpages-dyn:
     - manziarly.debian.org
     - cgi-grnet-01.debian.org
+  mirrormaster:
+    - melartin.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -131,12 +139,6 @@ roles:
     - 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:
@@ -149,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
@@ -160,6 +163,7 @@ roles:
     - dillon.debian.org
     - fasolo.debian.org
     - porta.debian.org
+    - static-master-grnet-01.debian.org
   static_mirror:
     - klecker.debian.org
     - mirror-anu.debian.org
@@ -237,9 +241,15 @@ 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
+        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:
@@ -266,6 +276,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:
@@ -282,22 +294,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
@@ -317,10 +315,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