X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fmail_incoming_port.pp;h=e8db01d41ed60e44e7b33ca228e4983a0e90a045;hb=19bd4c6005711f958bc612a45e92292616ecfd24;hp=cbe9cb613ba0d53dd71bc4149c8155be70d76eb7;hpb=2df9a9bac3e0c1ca36aa0d427056196c0cbe1d92;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 cbe9cb613..e8db01d41 100644
--- a/modules/debian_org/manifests/mail_incoming_port.pp
+++ b/modules/debian_org/manifests/mail_incoming_port.pp
@@ -1,23 +1,24 @@
 class debian_org::mail_incoming_port {
-	case getfromhash($site::nodeinfo, 'mail_port') {
-		Numeric: { $mail_port = sprintf("%d", getfromhash($site::nodeinfo, 'mail_port')) }
+	case getfromhash($deprecated::nodeinfo, 'mail_port') {
+		Numeric: { $mail_port = sprintf("%d", getfromhash($deprecated::nodeinfo, 'mail_port')) }
 		/^(\d+)$/: { $mail_port = $1 }
 		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/exim/files/certs/${::fqdn}.crt",
+		certfile => "${autocertdir}/${::fqdn}.crt",
 		port     => $mail_port,
 		hostname => $::fqdn,
 	}