X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=e53f7e4c71d8b0446783804b28a30bd96878f5b6;hb=19bd4c6005711f958bc612a45e92292616ecfd24;hp=864209d3e792f0acfd36992547515561e8ac065d;hpb=1975d51d084ae1c8bda3d939b00bc2687ed7873d;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 864209d3e..e53f7e4c7 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -59,9 +59,6 @@ roles:
     # XXX - ONLY used by ferm templates/defs.conf.erb
     - mailly.debian.org
     - muffat.debian.org
-  mirrormaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - melartin.debian.org
   muninmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - menotti.debian.org
@@ -107,16 +104,6 @@ roles:
     wieck.debian.org:
       service-hostname: wieck.security.backend.mirrors.debian.org
       fastly-backend: true
-  syncproxy:
-    # XXX - used by ferm templates/defs.conf.erb
-    - gretchaninov.debian.org
-    - klecker.debian.org
-    - milanollo.debian.org
-    - mirror-anu.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - schmelzer.debian.org
-    - smit.debian.org
   postgres_backup_server:
     # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org
@@ -128,7 +115,7 @@ roles:
         - '130.89.148.12:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
-    new-klecker.debian.org: []
+    new-klecker.debian.org: {}
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -183,6 +170,7 @@ roles:
     - fasolo.debian.org
     - lw07.debian.org
     - melartin.debian.org
+    - postgresql-manda-01.debian.org
     - sallinen.debian.org
     - seger.debian.org
     - snapshotdb-manda-01.debian.org