projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
setup-dchroot: Request unmerged /usr
[mirror/dsa-puppet.git]
/
modules
/
debian_org
/
manifests
/
mail_incoming_port.pp
diff --git
a/modules/debian_org/manifests/mail_incoming_port.pp
b/modules/debian_org/manifests/mail_incoming_port.pp
index
ace2e35
..
d16d5bc
100644
(file)
--- 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)"
}
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',
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,
}
port => $mail_port,
hostname => $::fqdn,
}