retire obsolete muninmaster entry from common.yaml

[mirror/dsa-puppet.git] / data / common.yaml

diff --git a/data/common.yaml b/data/common.yaml
index fd6328b..75251f4 100644 (file)
--- 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,12 +99,11 @@ roles:
     - storace.debian.org
   debian_mirror:
     # XXX used also in ferm me.conf.erb
-    klecker.debian.org:
+    new-klecker.debian.org:
       listen-addresses:
         - '130.89.148.12:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
-    new-klecker.debian.org: {}
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -125,26 +121,6 @@ roles:
         - '[2a02:16a8:dc41:100::232]:80'
       fastly-backend: true
       service-hostname: conova.debian.backend.mirrors.debian.org
-  historical_mirror:
-    # XXX used also in ferm me.conf.erb
-    - gretchaninov.debian.org
-    - klecker.debian.org
-    - schmelzer.debian.org
-    - sibelius.debian.org
-  debug_mirror:
-    # XXX used also in ferm me.conf.erb
-    mirror-accumu.debian.org:
-      onion_v4_address: 130.242.6.199
-      service-hostname: accumu.debug.backend.mirrors.debian.org
-    schmelzer.debian.org:
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[2a02:16a8:dc41:100::232]:80'
-      onion_v4_address: 217.196.149.232
-      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