X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=54f1933b3c5c3586e801319da3b1fd91fe429776;hb=4f61b8e70efe97667851c2db0034339a33ae1c06;hp=3c40623d64826184ac0dfc7c0b6bc577464e137a;hpb=108cf6c59c96238bc76eb2150632e21c2c6d3e26;p=dsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 3c40623d..54f1933b 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -23,13 +23,23 @@ class exim::mx inherits exim {
 		domain      => 'ip6',
 		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
 	}
-	dnsextras::entry{ "tlsa-submission":
+	dnsextras::tlsa_record{ "tlsa-submission":
 		zone => 'debian.org',
-		label => "_587._tcp.${::fqdn}",
-		rrtype => 'TXT',
-		rrdata => 'testing' }
-
+		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,
+		}
+	}
 }