X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=84d5d5229393c0ad971941bce11432de0a914f4d;hb=34500ff944848374edaac6d25d5d802dafe3f6ff;hp=ca695de5ba5a75f123593d515a54257396e91974;hpb=6a59b7f5b40a60504425a237d404837345aa358b;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ca695de5b..84d5d5229 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:
@@ -44,6 +44,9 @@ 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:
@@ -111,6 +114,7 @@ roles:
     - diabelli.debian.org
     - jerea.debian.org
     - nono.debian.org
+    - tate.debian.org
     - ticharich.debian.org
   static_master:
     - dillon.debian.org
@@ -118,29 +122,29 @@ roles:
   static_mirror:
     - busoni.debian.org
     - klecker.debian.org
-    - senfter.debian.org
+    - mirror-anu.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
-    - mirror-anu.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
-    - mirror-anu.debian.org
   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
-    - klecker.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -150,19 +154,21 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
+    - busoni.debian.org
     - gluck.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
@@ -176,3 +182,5 @@ roles:
   mirror_debug:
     - klecker.debian.org
     - mirror-isc.debian.org
+  planet_search:
+    - philp.debian.org