X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=bf9a3ebb3f5493a1779bb2a65a4b162b436d5415;hb=2ebc03ce2726310ca86c1d7178f72b4b1ccfea79;hp=16e84de7993f771e2871bad66be26ab789ba9b19;hpb=b2a34fb14c2c3187aaf4d5276e6fd9a3541b06f3;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 16e84de79..bf9a3ebb3 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -15,12 +15,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:
@@ -30,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:
@@ -44,17 +45,16 @@ 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:
-    - oyens.debian.org
   keystone_rabbitmq:
     - rainier.debian.org
     - rapoport.debian.org
-  memcached:
-    - oyens.debian.org
   lists:
     - bendel.debian.org
   list_search:
@@ -62,6 +62,9 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
+  manpages-dyn:
+    - manziarly.debian.org
+    - cgi-grnet-01.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
@@ -70,7 +73,7 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
+    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -88,22 +91,37 @@ roles:
     - handel.debian.org
   qamaster:
     - quantz.debian.org
-  release:
-    - franck.debian.org
   rtmaster:
     - reger.debian.org
-  security_master:
-    - seger.debian.org
-  security_tracker:
-    - soriano.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
+    - 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
@@ -111,32 +129,50 @@ roles:
     - 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
-    - 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
-    - mirror-anu.debian.org
-    - mirror-isc.debian.org
   static_source:
-    - master.debian.org
+    - boott.debian.org
+    - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
     - lindsay.debian.org
+    - manziarly.debian.org
     - mekeel.debian.org
+    - porta.debian.org
     - philp.debian.org
+    - respighi.debian.org
     - wolkenstein.debian.org
+    - wuiet.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:
@@ -146,19 +182,20 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
-    - gluck.debian.org
+    - busoni.debian.org
+    - klecker.debian.org
     - mirror-anu.debian.org
-    - mirror-isc.debian.org
     - mirror-csail.debian.org
+    - mirror-isc.debian.org
     - mirror-umn.debian.org
     - santoro.debian.org
-    - busoni.debian.org
-    - klecker.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
@@ -169,3 +206,76 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
+  sreview.debian.org:
+    - vittoria.debian.org
+  debian_mirror:
+    # - klecker.debian.org
+    - bilbao.debian.org
+    - boman.debian.org
+    - mirror-isc.debian.org
+  debian_mirror_onion:
+    - bilbao.debian.org
+    - mirror-isc.debian.org
+  historical_master:
+    - sibelius.debian.org
+  historical_mirror:
+    - gretchaninov.debian.org
+    - klecker.debian.org
+    - sibelius.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
+  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-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:
+    - bilbao.debian.org
+    - mirror-conova.debian.org
+  cdimage-search:
+    - cgi-grnet-01.debian.org