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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 256c844c5..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
@@ -45,20 +57,14 @@ roles:
     - cgi-grnet-01.debian.org
   git_master:
     - adayevskaya.debian.org
-  httpredir:
-    - httpredir-bm-01.debian.org
-    - httpredir-csail-01.debian.org
+  historicalpackages:
+    - hier.debian.org
   jenkins:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone_rabbitmq:
-    - rainier.debian.org
-    - rapoport.debian.org
   lists:
     - bendel.debian.org
-  list_search:
-    - stockhausen.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -115,6 +121,7 @@ roles:
     - mirror-isc.debian.org
     - mirror-umn.debian.org
     - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
     - lobos.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
@@ -129,11 +136,16 @@ roles:
   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:
+    - suchon.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
+    - suchon.debian.org
     - usper.debian.org
   sso:
     - diabelli.debian.org
@@ -150,8 +162,8 @@ roles:
     - dillon.debian.org
     - fasolo.debian.org
     - porta.debian.org
+    - static-master-grnet-01.debian.org
   static_mirror:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
@@ -159,7 +171,6 @@ roles:
     - senfter.debian.org
     - santoro.debian.org
   static_mirror_onion:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-isc.debian.org
     - senfter.debian.org
@@ -186,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:
@@ -197,7 +209,6 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
@@ -231,6 +242,7 @@ roles:
     - klecker.debian.org
     - mirror-bytemark.debian.org
     - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
     - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
@@ -272,18 +284,11 @@ roles:
   onionbalance:
     - olin.debian.org
   experimental_apache:
-    - beach.debian.org
-    - busoni.debian.org
     - cgi-grnet-01.debian.org
     - coccia.debian.org
-    - draghi.debian.org
     - klecker.debian.org
-    - lobos.debian.org
     - manziarly.debian.org
-    - milanollo.debian.org
-    - mirror-anu.debian.org
     - mirror-bytemark.debian.org
-    - mirror-conova.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
@@ -294,15 +299,13 @@ roles:
     - pkgmirror-csail.debian.org
     - santoro.debian.org
     - sechter.debian.org
-    - senfter.debian.org
     - setoguchi.debian.org
     - ticharich.debian.org
-    - villa.debian.org
-    - wieck.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
     - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org
   apache_prefork:
@@ -311,6 +314,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
@@ -319,3 +323,7 @@ roles:
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
+  salsa.debian.org:
+    - godard.debian.org
+  insecure_ssl:
+    - godard.debian.org