X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=cddf405cebaa52694e3fbc83675de0196bdd2d2e;hb=d77e8c7fb6bd4f16feab014625b910ec007ef8f1;hp=e035abb73580f86139e26d282a0dc67f66622ab0;hpb=8bdb11e51dd58922fa1ba71b2c5c8c27bfe44584;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index e035abb73..cddf405ce 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -23,9 +23,10 @@ class exim::mx inherits exim {
 		domain      => 'ip6',
 		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
 	}
+	$autocertdir = hiera('paths.auto_certs_dir')
 	dnsextras::tlsa_record{ "tlsa-submission":
 		zone => 'debian.org',
-		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+		certfile => "${autocertdir}/${::fqdn}.crt",
 		port => 587,
 		hostname => "$::fqdn",
 	}
@@ -33,7 +34,13 @@ class exim::mx inherits exim {
 		ensure => installed,
 	}
 
-	file { '/etc/cron.d/dsa-email-virtualdomains':
-		source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
-	}
+	if has_role('mailrelay') {
+		concat::fragment { 'dsa-puppet-stuff--email-virtualdomains':
+			target => '/etc/cron.d/dsa-puppet-stuff',
+			content  => @(EOF)
+				@hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
+				| EOF
+		}
+	}
+	file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
 }