X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=232dff91ba7067b39c64b099ffc2b1ff1504661b;hb=15811369946e05646a4743712dd8a58a3bd37038;hp=e46c98b9fc1255a401a8d4df35b87790a9e48899;hpb=a267aff549db1af408a625a7c213a1a61dd28442;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e46c98b9f..232dff91b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -82,6 +82,9 @@ roles:
     - paradis.debian.org
   piuparts:
     - pejacevic.debian.org
+  piuparts_slave:
+    - piu-slave-bm-a.debian.org
+    - piu-slave-ubc-01.debian.org
   popcon:
     - pinel.debian.org
   pubsub:
@@ -101,14 +104,17 @@ roles:
     - cgi-grnet-01.debian.org
   archvsync_base_additional:
   # this is usually pulled in by *-mirror or syncproxy roles
-    - mirror-conova.debian.org
+    - dummy
   security_master:
     - seger.debian.org
   security_mirror:
     - mirror-anu.debian.org
+    - mirror-bytemark.debian.org
+    - mirror-conova.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
+    - mirror-accumu.debian.org
     - lobos.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
@@ -120,6 +126,11 @@ 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-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
   ssh.upload.d.o:
@@ -204,6 +215,10 @@ roles:
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
+  bacula_director:
+    - dinis.debian.org
+  bacula_storage:
+    - storace.debian.org
   dabackup_client:
     - moszumanska.debian.org
     - lw03.debian.org
@@ -214,22 +229,25 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    # - klecker.debian.org
-    - bilbao.debian.org
-    - boman.debian.org
+    - klecker.debian.org
+    - mirror-bytemark.debian.org
+    - mirror-accumu.debian.org
     - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
-    - bilbao.debian.org
+    - klecker.debian.org
+    - mirror-bytemark.debian.org
     - mirror-isc.debian.org
   historical_master:
     - sibelius.debian.org
   historical_mirror:
     - gretchaninov.debian.org
     - klecker.debian.org
+    - mirror-conova.debian.org
     - sibelius.debian.org
   debug_mirror:
     - klecker.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
   debug_mirror_onion:
     - klecker.debian.org
@@ -265,6 +283,8 @@ roles:
     - 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
@@ -281,7 +301,22 @@ roles:
     - villa.debian.org
     - wieck.debian.org
   bgp:
-    - bilbao.debian.org
+    - mirror-bytemark.debian.org
     - mirror-conova.debian.org
+    - mirror-accumu.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org
+  apache_prefork:
+    # php needs this
+    - quantz.debian.org
+    - tchaikovsky.debian.org
+    - wuiet.debian.org
+  postgresql_server:
+    - bmdb1.debian.org
+    - buxtehude.debian.org
+    - danzi.debian.org
+    - fasolo.debian.org
+    - melartin.debian.org
+    - seger.debian.org
+    - sibelius.debian.org
+    - vittoria.debian.org