X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=618cd540a456467c191b0db1a1ef9d7cfea4dd33;hb=cb2e9607cf2092ee657889e2eaee4224eadd7bfe;hp=050ee29e7452bde342e8985fc28a0923e66ebe29;hpb=0a15224bac570e602bdf9cafc9741d265000b25e;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 050ee29e7..618cd540a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,6 +3,18 @@ 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'
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -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:
@@ -287,7 +301,6 @@ roles:
     - sechter.debian.org
     - setoguchi.debian.org
     - ticharich.debian.org
-    - villa.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -312,3 +325,5 @@ roles:
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
+  insecure_ssl:
+    - godard.debian.org