retire bugsmx role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7b6ed20..48c21b2 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -33,9 +33,6 @@ staticsync::basedir: '/srv/static.debian.org'
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09
 roles:
-  bugsmx:
-    # XXX - exim config flag only
-    - buxtehude.debian.org
   dns_primary:
     # XXX - used by ferm templates/defs.conf.erb
     - denis.debian.org

diff --git a/hieradata/nodes/buxtehude.debian.org.yaml b/hieradata/nodes/buxtehude.debian.org.yaml
index 8d9fac3..b93b964 100644 (file)
--- a/hieradata/nodes/buxtehude.debian.org.yaml
+++ b/hieradata/nodes/buxtehude.debian.org.yaml
@@ -5,3 +5,5 @@ classes:
 apache2::smaller_number_of_threads: true
 # debbugs cgis like to fork and don't deal well with EAGAIN
 apache2::rlimitnproc: 450
+
+exim::is_bugsmx: true

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 59b87f7..882a3c2 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,9 +1,9 @@
 class exim (
+  Boolean $is_bugsmx = false,
   Boolean $is_rtmaster = false,
 ) {
 
   $is_mailrelay = has_role('mailrelay')
-  $is_bugsmx = has_role('bugsmx')
   $is_packagesmaster = has_role('packagesmaster')
   $is_packagesqamaster = has_role('packagesqamaster')