X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=54f1933b3c5c3586e801319da3b1fd91fe429776;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=c1b4fdbca3afc289dac07dbf90749fa0d04c34e3;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index c1b4fdbca..54f1933b3 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -13,14 +13,33 @@ class exim::mx inherits exim {
 		notify  => Service['exim4'],
 	}
 
+	# MXs used as smarthosts
 	@ferm::rule { 'dsa-exim-submission':
 		description => 'Allow SMTP',
-		rule        => '&SERVICE_RANGE(tcp, submission, \$SMTP_SOURCES)'
+		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
 	}
 	@ferm::rule { 'dsa-exim-v6-submission':
 		description => 'Allow SMTP',
 		domain      => 'ip6',
-		rule        => '&SERVICE_RANGE(tcp, submission, \$SMTP_V6_SOURCES)',
+		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
+	}
+	dnsextras::tlsa_record{ "tlsa-submission":
+		zone => 'debian.org',
+		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+		port => 587,
+		hostname => "$::fqdn",
+	}
+	package { 'nagios-plugins-standard':
+		ensure => installed,
 	}
 
+	if has_role('mailrelay') {
+		file { '/etc/cron.d/dsa-email-virtualdomains':
+			source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+		}
+	} else {
+		file { '/etc/cron.d/dsa-email-virtualdomains':
+			ensure => absent,
+		}
+	}
 }