From a1e5d966dc866d7d3298cd3538ad583328a11991 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 1 Sep 2017 16:00:30 +0000
Subject: [PATCH] There is no bugsmaster role anymore.  Remove remaining users

---
 modules/exim/manifests/init.pp      |  1 -
 modules/exim/templates/eximconf.erb | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 49504e05e..8b4702413 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,7 +1,6 @@
 class exim {
 
 	$is_mailrelay = has_role('mailrelay')
-	$is_bugsmaster = has_role('bugsmaster')
 	$is_bugsmx = has_role('bugsmx')
 	$is_rtmaster = has_role('rtmaster')
 	$is_packagesmaster = has_role('packagesmaster')
diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 7517c26b6..05d79fb0f 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -220,7 +220,7 @@ ports = []
 out = "daemon_smtp_ports = "
 ports << 25
 
-if @is_bugsmaster or @is_bugsmx
+if @is_bugsmx
   ports << 587
 end
 
@@ -317,7 +317,7 @@ acl_getprofile:
   accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 
 <%- end -%>
-<%- if @is_bugsmaster or @is_bugsmx -%>
+<%- if @is_bugsmx -%>
   warn    domains        = bugs.debian.org
           set acl_m_rprf = BugsMail
 
@@ -1468,11 +1468,8 @@ virt_users:
 
 <%=
 out = ""
-if @is_bugsmaster or @is_bugsmx
+if @is_bugsmx
   domain = 'bugs.debian.org'
-  if @is_bugsmaster
-    domain = 'bugs-master.debian.org'
-  end
   out = '
 # This router delivers for bugs.d.o
 bugs:
@@ -1622,7 +1619,7 @@ bsmtp:
 		     {$value}fail}\
 		   }}
 
-<%- if @is_bugsmaster or @is_bugsmx -%>
+<%- if @is_bugsmx -%>
 bugs_pipe:
   driver = pipe
   command = /srv/bugs.debian.org/mail/run-procmail
-- 
2.20.1