historical_mirror -> hiera role

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

diff --git a/data/common.yaml b/data/common.yaml
index e53f7e4..4c504ae 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -12,6 +12,8 @@ resolv::nameservers: []
 resolv::searchpaths: ['debian.org']
 staticsync::user: 'staticsync'
 staticsync::basedir: '/srv/static.debian.org'
+exim::smarthost: 'mailout.debian.org'
+postfix::smarthost: 'mailout.debian.org'
 
 roles::dns_primary::allow_access:
   # easydns
@@ -52,22 +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
-  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:
@@ -133,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:
@@ -156,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