X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=e5b051b2590e0d1488b6f7c2516c46230411fb6c;hb=8761921fdf2e73d66bbf4438f2f1e33f30b544ef;hp=222b805112852868297ce9b14a13d137cdb00ed5;hpb=0f81c0baea06f2ec09b3b4ce73556cd323a6b697;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 222b80511..e5b051b25 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,12 @@
 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')
+	$is_packagesqamaster = has_role('packagesqamaster')
+
 	include exim::vdomain::setup
 
 	munin::check { 'ps_exim4': script => 'ps_' }
@@ -28,9 +35,6 @@ class exim {
 		]
 	}
 
-	file { '/etc/cron.d/dsa-email-virtualdomains':
-		source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
-	}
 	file { '/etc/exim4/':
 		ensure  => directory,
 		mode    => '0755',