X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=95a24c1234c3ad7880bf0e40cc1e8184d6e8c89c;hb=839e0ee97e5252968e9e0c5f7ae486fb0d26dd2e;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..95a24c123 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_' }
@@ -17,7 +24,7 @@ class exim {
 	concat::fragment { 'virtual_domain_template':
 		target  => '/etc/exim4/virtualdomains',
 		content => template('exim/virtualdomains.erb'),
-		order   => 05,
+		order   => '05',
 	}
 
 	service { 'exim4':
@@ -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',
@@ -50,7 +54,7 @@ class exim {
 	}
 	file { '/etc/exim4/ssl':
 		ensure  => directory,
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0750',
 		purge   => true,
 	}
@@ -106,32 +110,33 @@ class exim {
 	}
 	file { '/etc/exim4/ssl/thishost.crt':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/thishost.key':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crt':
 		source  => 'puppet:///modules/exim/certs/ca.crt',
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crl':
 		source  => 'puppet:///modules/exim/certs/ca.crl',
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/var/log/exim4':
 		ensure  => directory,
 		mode    => '2750',
-		owner   => Debian-exim,
+		owner   => 'Debian-exim',
 		group   => maillog,
 	}
 
 	case getfromhash($site::nodeinfo, 'mail_port') {
+                Numeric: { $mail_port = sprintf("%d", getfromhash($site::nodeinfo, 'mail_port')) }
 		/^(\d+)$/: { $mail_port = $1 }
 		default: { $mail_port = '25' }
 	}