X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=515cbb87552ba46344b9999b8d3b9dd9686a91d0;hb=c828a1b822d2987966270de951718a77b2a08511;hp=deaf099e983eeba97ea730f1a991f2f2cdbc78f8;hpb=372685900fc51ce956bddc100bc534327946bb10;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index deaf099e9..515cbb875 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,12 +30,13 @@ roles:
   extranrpeclient:
     - denis.debian.org
   ftp.d.o:
+    # also see debian_mirror
     - klecker.debian.org
   ftp_master:
-    - franck.debian.org
+    - fasolo.debian.org
   ftp.upload.d.o:
-    - franck.debian.org
     - coccia.debian.org
+    - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
   dgit_browse:
@@ -53,13 +52,9 @@ roles:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone:
-    - oyens.debian.org
   keystone_rabbitmq:
     - rainier.debian.org
     - rapoport.debian.org
-  memcached:
-    - oyens.debian.org
   lists:
     - bendel.debian.org
   list_search:
@@ -67,9 +62,9 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
-  manpages:
-    - glinka.debian.org
+  manpages-dyn:
     - manziarly.debian.org
+    - cgi-grnet-01.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -78,7 +73,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -87,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:
@@ -96,8 +94,6 @@ roles:
     - handel.debian.org
   qamaster:
     - quantz.debian.org
-  release:
-    - franck.debian.org
   rtmaster:
     - reger.debian.org
   rtc:
@@ -106,10 +102,15 @@ 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
@@ -117,7 +118,6 @@ roles:
     - santoro.debian.org
     - setoguchi.debian.org
     - sechter.debian.org
-    - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
   security_mirror_onion:
@@ -125,10 +125,15 @@ 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-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
+    - usper.debian.org
   sso:
     - diabelli.debian.org
   # single sign on relying party (host) - also required apache2 module enabled on that host via other means
@@ -139,9 +144,10 @@ roles:
     - quantz.debian.org
     - tate.debian.org
     - ticharich.debian.org
+    - wilder.debian.org
   static_master:
     - dillon.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
     - porta.debian.org
   static_mirror:
     - busoni.debian.org
@@ -160,18 +166,22 @@ roles:
   static_mirror_nopush:
     - dummy
   static_source:
+    - boott.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
     - lindsay.debian.org
-    - master.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
@@ -203,6 +213,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,10 +224,36 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
-  mirror_debug:
+  sreview.debian.org:
+    - vittoria.debian.org
+  debian_mirror:
+    - klecker.debian.org
+    - mirror-bytemark.debian.org
+    - mirror-accumu.debian.org
+    - mirror-conova.debian.org
+    - mirror-isc.debian.org
+  debian_mirror_onion:
+    - 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
     - mirror-isc.debian.org
-  mirror_ports:
+  ports_mirror:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  ports_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
   planet_search:
@@ -226,7 +266,55 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   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
+    - pejacevic.debian.org
+    - petrova.debian.org
+    - philp.debian.org
+    - picconi.debian.org
+    - 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
+  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