X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=data%2Fcommon.yaml;h=37432d711265ea44b03de759b2c190e54314d60d;hb=d25a2c76158604d7f45e732f3655082376231811;hp=a13f295864cd97b4d89c4596e6196d993717e80f;hpb=dd84bd005d2b8ac910d4d239054eda5e29c633dc;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index a13f29586..37432d711 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
@@ -100,40 +97,6 @@ roles:
     # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org
     - storace.debian.org
-  debian_mirror:
-    # XXX used also in ferm me.conf.erb
-    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
-    mirror-skroutz.debian.org:
-      service-hostname: skroutz.debian.backend.mirrors.debian.org
-      fastly-backend: true
-    mirror-isc.debian.org:
-      listen-addresses:
-        - '149.20.4.15:80'
-        - '[2001:4f8:1:c::15]:80'
-      onion_v4_address: 149.20.4.15
-    schmelzer.debian.org:
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[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