X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=6baf03c412e7cdcccf407b5541042847348a605e;hb=6832fcf5d8cbc0071e33a54d0c2c186cb3c6c775;hp=eceb27936f29650d0a9091df575ae844408a9007;hpb=8ac239fcf702f53c3efab758e136e3d60349fb94;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index eceb27936..6baf03c41 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,6 +4,8 @@ searchpaths: []
 resolvoptions: []
 allow_dns_query: []
 roles:
+  archive_master:
+    - sibelius.debian.org
   bugsmx:
     - buxtehude.debian.org
   bugs_master:
@@ -15,12 +17,12 @@ roles:
     - beach.debian.org
   buildd_master:
     - wuiet.debian.org
-  buildd_ports_master:
-    - portman.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
     - draghi.debian.org
+  debtags:
+    - tate.debian.org
   dns_primary:
     - denis.debian.org
   dns_geo:
@@ -32,18 +34,33 @@ roles:
   ftp.d.o:
     - klecker.debian.org
   ftp_master:
+    - fasolo.debian.org
     - franck.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
+  memcached:
+    - oyens.debian.org
   lists:
     - bendel.debian.org
   list_search:
@@ -51,6 +68,9 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
+  manpages:
+    - glinka.debian.org
+    - manziarly.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -59,7 +79,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -68,6 +88,8 @@ roles:
     - paradis.debian.org
   piuparts:
     - pejacevic.debian.org
+  popcon:
+    - pinel.debian.org
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
@@ -75,63 +97,142 @@ 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
+  security_master:
+    - seger.debian.org
+  security_mirror:
+    - mirror-anu.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
+    - steffani.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_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
   static_master:
-    - bizet.debian.org
     - dillon.debian.org
     - franck.debian.org
+    - porta.debian.org
   static_mirror:
     - busoni.debian.org
     - klecker.debian.org
-    - senfter.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
+    - donizetti.debian.org
     - franck.debian.org
     - lindsay.debian.org
+    - mekeel.debian.org
+    - porta.debian.org
     - philp.debian.org
+    - respighi.debian.org
     - wolkenstein.debian.org
   syncproxy:
+    - 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:
-  #  - rXXXX.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
+  debug_mirror:
+    - klecker.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