X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=75251f4064a56857d022dc4321ed9027d3db0e11;hb=b754dfb6fab229a8893432f0a33405f4ca12cff8;hp=d7489e6a88df2b204163cf6554b92a29d6a4c702;hpb=6b4cdc62b58751da3d0389be86ff7a40f8386f3b;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index d7489e6a8..75251f406 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,9 +54,6 @@ apt::sources::debian::location: 'https://deb.debian.org/debian/'
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09
 roles:
-  muninmaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - menotti.debian.org
   nagiosmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - tchaikovsky.debian.org
@@ -102,7 +99,7 @@ roles:
     - storace.debian.org
   debian_mirror:
     # XXX used also in ferm me.conf.erb
-    new-klecker.debian.org: {}
+    new-klecker.debian.org:
       listen-addresses:
         - '130.89.148.12:80'
         - '[2001:67c:2564:a119::148:12]:80'
@@ -124,15 +121,6 @@ roles:
         - '[2a02:16a8:dc41:100::232]:80'
       fastly-backend: true
       service-hostname: conova.debian.backend.mirrors.debian.org
-  debug_mirror:
-    # XXX still used by the mirror health stuff
-    mirror-accumu.debian.org:
-      service-hostname: accumu.debug.backend.mirrors.debian.org
-    schmelzer.debian.org:
-      service-hostname: conova.debug.backend.mirrors.debian.org
-  debug_mirror_onion:
-    - mirror-accumu.debian.org
-    - schmelzer.debian.org
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org