X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fmail_incoming_port.pp;h=d16d5bc749085d54733971d81cfe1759b7bd02ae;hb=731c86b98743b06f4c3612b0ec9d3df2158126cc;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..d16d5bc74 100644 --- a/modules/debian_org/manifests/mail_incoming_port.pp +++ b/modules/debian_org/manifests/mail_incoming_port.pp @@ -15,9 +15,10 @@ class debian_org::mail_incoming_port { 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, }