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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7dd938dd0..9a6071ae2 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,6 +3,16 @@ 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'
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -36,7 +46,6 @@ roles:
     - fasolo.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
-    - suchon.debian.org
     - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
@@ -52,9 +61,6 @@ roles:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone_rabbitmq:
-    - rainier.debian.org
-    - rapoport.debian.org
   lists:
     - bendel.debian.org
   mailrelay:
@@ -133,6 +139,8 @@ roles:
     - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
+  security_upload:
+    - suchon.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
     - suchon.debian.org
@@ -186,6 +194,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:
@@ -289,7 +298,6 @@ roles:
     - sechter.debian.org
     - setoguchi.debian.org
     - ticharich.debian.org
-    - villa.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -303,6 +311,7 @@ roles:
     - tchaikovsky.debian.org
     - wuiet.debian.org
   postgresql_server:
+    # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
     - buxtehude.debian.org
     - danzi.debian.org
@@ -311,3 +320,7 @@ roles:
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
+  salsa.debian.org:
+    - godard.debian.org
+  insecure_ssl:
+    - godard.debian.org