X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=hieradata%2Fcommon.yaml;h=fd34e41c2059b97f950e299eb7c88214ea01c9da;hb=6800e1e9e21c1f61864b0cb48cba5912c11eb941;hp=fccf7eb32e01323d054c9bbe16c243647c2e0e80;hpb=8feed5d25b3361822eb9b06665e28b9a91e15d0c;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index fccf7eb32..fd34e41c2 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -45,9 +45,10 @@ roles:
     - cgi-grnet-01.debian.org
   git_master:
     - adayevskaya.debian.org
+  historicalpackages:
+    - hier.debian.org
   httpredir:
-    - httpredir-bm-01.debian.org
-    - httpredir-csail-01.debian.org
+    - dummy
   jenkins:
     - jerea.debian.org
   keyring:
@@ -82,6 +83,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:
@@ -106,10 +110,13 @@ roles:
     - 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
+    - mirror-skroutz.debian.org
     - lobos.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
@@ -121,6 +128,12 @@ 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-skroutz.debian.org
+    - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
   ssh.upload.d.o:
@@ -205,6 +218,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
@@ -215,22 +232,26 @@ 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-skroutz.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
@@ -266,6 +287,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
@@ -282,7 +305,23 @@ roles:
     - villa.debian.org
     - wieck.debian.org
   bgp:
-    - bilbao.debian.org
+    - 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:
+    # 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