X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=e5e4dae25675a0fe7c297560cfc23ca21a5515bc;hb=de7624e71124fa59b533602b266103a18c019334;hp=e7c98be11c0dbd1882cfa9f511b1b584b3db02b0;hpb=159f9d320359cb17eb3e10006ab1ace4f4900df6;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e7c98be11..e5e4dae25 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,8 +4,6 @@ searchpaths: []
 resolvoptions: []
 allow_dns_query: []
 roles:
-  archive_master:
-    - sibelius.debian.org
   bugsmx:
     - buxtehude.debian.org
   bugs_master:
@@ -32,6 +30,7 @@ roles:
   extranrpeclient:
     - denis.debian.org
   ftp.d.o:
+    # also see debian_mirror
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
@@ -46,9 +45,8 @@ 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:
@@ -83,6 +81,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:
@@ -100,13 +101,20 @@ roles:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
+  archvsync_base_additional:
+  # this is usually pulled in by *-mirror or syncproxy roles
+    - 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
+    - mirror-skroutz.debian.org
     - lobos.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
@@ -118,6 +126,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:
@@ -163,12 +177,14 @@ roles:
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
+    - melartin.debian.org
     - porta.debian.org
     - philp.debian.org
     - respighi.debian.org
     - wolkenstein.debian.org
     - wuiet.debian.org
   syncproxy:
+    - gretchaninov.debian.org
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
@@ -200,6 +216,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
@@ -210,16 +230,26 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - 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
@@ -240,7 +270,7 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
@@ -255,6 +285,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
@@ -271,6 +303,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