X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=2e01263404365c257523384dc6ab35f32f64a0ee;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=a80493ff3bcd2a43374b59793e0bd66f4fc2dfc0;hpb=27df7595c64c4bdfd9c57291f7dc0220fe48f730;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a80493ff3..2e0126340 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -19,6 +19,8 @@ roles:
     - nono.debian.org
   dbmaster:
     - draghi.debian.org
+  debtags:
+    - tate.debian.org
   dns_primary:
     - denis.debian.org
   dns_geo:
@@ -28,23 +30,41 @@ 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:
+    - cgi-grnet-01.debian.org
+  dgit_git:
+    - cgi-grnet-01.debian.org
   git_master:
     - adayevskaya.debian.org
+  httpredir:
+    - httpredir-bm-01.debian.org
+    - httpredir-csail-01.debian.org
+  jenkins:
+    - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone:
-    - oyens.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
+  manpages-dyn:
+    - manziarly.debian.org
+    - cgi-grnet-01.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -53,7 +73,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -62,6 +82,11 @@ 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:
     - rainier.debian.org
     - rapoport.debian.org
@@ -69,57 +94,222 @@ roles:
     - handel.debian.org
   qamaster:
     - quantz.debian.org
-  release:
-    - franck.debian.org
   rtmaster:
     - reger.debian.org
-  security_master:
-    - chopin.debian.org
-  security_tracker:
-    - soler.debian.org
   rtc:
     - vogler.debian.org
+  search_backend:
+    - 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
+    - lobos.debian.org
+    - santoro.debian.org
+    - setoguchi.debian.org
+    - sechter.debian.org
+    - villa.debian.org
+    - wieck.debian.org
+  security_mirror_onion:
+    - mirror-isc.debian.org
+    - 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
+  sso_rp:
+    - diabelli.debian.org
+    - jerea.debian.org
+    - nono.debian.org
+    - quantz.debian.org
+    - tate.debian.org
+    - ticharich.debian.org
+    - wilder.debian.org
   static_master:
-    - bizet.debian.org
     - dillon.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
+    - porta.debian.org
   static_mirror:
     - busoni.debian.org
     - klecker.debian.org
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - senfter.debian.org
+    - santoro.debian.org
+  static_mirror_onion:
+    - busoni.debian.org
+    - klecker.debian.org
+    - mirror-isc.debian.org
     - senfter.debian.org
+  # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
+  static_mirror_nopush:
+    - dummy
   static_source:
-    - master.debian.org
+    - boott.debian.org
+    - coccia.debian.org
     - dillon.debian.org
-    - franck.debian.org
-    - lilburn.debian.org
+    - donizetti.debian.org
+    - fasolo.debian.org
+    - lindsay.debian.org
+    - manziarly.debian.org
+    - mekeel.debian.org
+    - melartin.debian.org
+    - porta.debian.org
     - philp.debian.org
-    - ravel.debian.org
-    - senfl.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
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
   tracker:
     - ticharich.debian.org
   udd:
     - ullmann.debian.org
   vote:
     - vento.debian.org
-  #weblog_destination:
-  #  - ravel.debian.org
-  #weblog_provider:
-  #  - busoni.debian.org
-  #  - klecker.debian.org
-  #  - senfter.debian.org
+  weblog_destination:
+    - wolkenstein.debian.org
+  weblog_provider:
+    - busoni.debian.org
+    - klecker.debian.org
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - santoro.debian.org
+    - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:
     - wolkenstein.debian.org
+  cgi.d.o:
+    - wolkenstein.debian.org
   postgres_backup_server:
     - backuphost.debian.org
+    - storace.debian.org
   dabackup_client:
     - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
+  veyepar.debian.org:
+    - vittoria.debian.org
+  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
+  ports_mirror:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  ports_mirror_onion:
+    - klecker.debian.org
+    - mirror-isc.debian.org
+  planet_search:
+    - philp.debian.org
+  i18n.d.o:
+    - tye.debian.org
+  l10n.d.o:
+    - tye.debian.org
+  dedup.d.n:
+    - delfin.debian.org
+  pet.d.n:
+    - petrova.debian.org
+  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
+  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