X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=618cd540a456467c191b0db1a1ef9d7cfea4dd33;hb=5ebd9d273478f4c4aad32db2050fa18b7e21668f;hp=b0cbf208f2ac77e8932ef5407419cc568b04150e;hpb=b357c850f3122c4e3bd79a4f509012b2288f9c98;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b0cbf208f..618cd540a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,9 +3,18 @@ nameservers: []
 searchpaths: []
 resolvoptions: []
 allow_dns_query: []
-role_config:
-  syncproxy:
-    mirror_basedir_prefix: '/srv/mirrors/'
+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'
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -153,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