X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=4c504ae78d3e50a078c6af13c9521307c2c863af;hb=a0d0b0d1b7a695b32e9078d6f551249861c775b9;hp=f5090f255c5da964b8bc1d2fc172355e6565f4b1;hpb=049e98c9ae6f224faa638760b4da45f01a10b7af;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index f5090f255..4c504ae78 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,18 +54,12 @@ 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
   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:
@@ -131,15 +125,6 @@ roles:
         - '[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:
@@ -154,9 +139,6 @@ roles:
   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