X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=42232e148e6f361c5fd8449ff4dd2fbcae39c158;hb=f14a5d9684bb2503306ce4db814e193be5af22d9;hp=1f209a5a99276a44dbafc898eda70eb557bc0f28;hpb=7420f04153f0a947fe01c576dabfa26ba036f5bb;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 1f209a5a9..42232e148 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:
@@ -44,6 +46,11 @@ roles:
     - 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:
@@ -60,6 +67,9 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
+  manpages:
+    - glinka.debian.org
+    - manziarly.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -91,10 +101,8 @@ roles:
   rtmaster:
     - reger.debian.org
   security_master:
-    - chopin.debian.org
     - seger.debian.org
   security_tracker:
-    - soler.debian.org
     - soriano.debian.org
   rtc:
     - vogler.debian.org
@@ -106,53 +114,86 @@ roles:
     - coccia.debian.org
   sso:
     - diabelli.debian.org
-  # single sign on relying party (host)
+  # 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
   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
   # 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
     - dillon.debian.org
     - donizetti.debian.org
     - franck.debian.org
     - lindsay.debian.org
+    - master.debian.org
     - mekeel.debian.org
     - philp.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
+  mirror_debug:
+    - 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