X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fmail_incoming_port.pp;h=f74231fa3ab7e96b58920b0a29de458ffc69f5c8;hb=accfb8fd412b17c2b61f9ab1173aad720c8ffd61;hp=ace2e352f08764d63bf17aea98f6191af580eb28;hpb=dd6385d0133716bda9e049597e71c5f3d9acaa8d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/mail_incoming_port.pp b/modules/debian_org/manifests/mail_incoming_port.pp
index ace2e352f..f74231fa3 100644
--- a/modules/debian_org/manifests/mail_incoming_port.pp
+++ b/modules/debian_org/manifests/mail_incoming_port.pp
@@ -5,19 +5,20 @@ class debian_org::mail_incoming_port {
 		default: { $mail_port = '25' }
 	}
 
-	@ferm::rule { 'dsa-mail':
+	ferm::rule { 'dsa-mail':
 		description => 'Allow SMTP',
 		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
 	}
 
-	@ferm::rule { 'dsa-mail-v6':
+	ferm::rule { 'dsa-mail-v6':
 		description => 'Allow SMTP',
 		domain      => 'ip6',
 		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
 	}
+	$autocertdir = hiera('paths.auto_certs_dir')
 	dnsextras::tlsa_record{ 'tlsa-mailport':
 		zone     => 'debian.org',
-		certfile => "/etc/puppet/modules/ssl/files/auto-certs/${::fqdn}.crt",
+		certfile => "${autocertdir}/${::fqdn}.crt",
 		port     => $mail_port,
 		hostname => $::fqdn,
 	}