X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=af8df16f4ac78a6b298b0961e8270a1f8249100e;hb=fa1d81cd557aa9f3446fa260eaf08c86fbff072c;hp=d15c91d9a981944aa3ef5a26ba68119ff4941f69;hpb=66600a95d6469f7b8393b1724649b1f8a5ef3678;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d15c91d9a..af8df16f4 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,6 +3,22 @@ nameservers: []
 searchpaths: []
 resolvoptions: []
 allow_dns_query: []
+role_config__mirrors:
+  mirror_basedir_prefix: '/srv/mirrors/'
+role_config__syncproxy:
+  mirror_basedir_prefix: '/srv/mirrors/'
+samhain_recipients:
+  - 'debian-archive-debian-samhain-reports@master.debian.org'
+  - 'debian-admin@ftbfs.de'
+  - '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
@@ -59,6 +75,8 @@ roles:
   manpages-dyn:
     - manziarly.debian.org
     - cgi-grnet-01.debian.org
+  mirrormaster:
+    - melartin.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -121,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:
@@ -150,6 +162,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
@@ -184,6 +197,7 @@ roles:
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
   tracker:
@@ -271,22 +285,9 @@ 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
@@ -313,3 +314,5 @@ roles:
     - godard.debian.org
   insecure_ssl:
     - godard.debian.org
+  debsources:
+    - sor.debian.org