X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=635f03ecca3977891df0aacca263a593f0505a69;hb=add63b4edd7236df5114ae7fc84c3ff984cc0de0;hp=493121e7726d80cbcba0b77c9920797806ea7cd2;hpb=0e22e1050b83c956f65a4d8376936115d15b8133;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index 493121e77..635f03ecc 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,22 +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:
-  ftp_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - fasolo.debian.org
-  mailrelay:
-    # XXX - ONLY used by ferm templates/defs.conf.erb
-    - mailly.debian.org
-    - muffat.debian.org
-  muninmaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - menotti.debian.org
-  nagiosmaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - tchaikovsky.debian.org
-  security_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - seger.debian.org
   security_mirror:
     # XXX used also in ferm me.conf.erb
     mirror-anu.debian.org:
@@ -110,60 +94,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
-  historical_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - sibelius.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
-  ports_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - porta.debian.org
-  bgp:
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
   postgresql_server:
     # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org