X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=data%2Fcommon.yaml;h=5e3a009b3fabb7b31f0fdaa2e2de9d66371d2f79;hb=802f635d1cf0229c1521030b6f027f03b7170c10;hp=e724e5fdd4496d96358b7b29e233db14ed3f1e87;hpb=368e147f10b8e748f7e171a15568a94d79599039;p=mirror%2Fdsa-puppet.git

diff --git a/data/common.yaml b/data/common.yaml
index e724e5fdd..5e3a009b3 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -13,6 +13,7 @@ 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
@@ -53,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: