projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch postfix smarthost config to classparams
[mirror/dsa-puppet.git]
/
modules
/
postfix
/
templates
/
main.cf-header.erb
diff --git
a/modules/postfix/templates/main.cf-header.erb
b/modules/postfix/templates/main.cf-header.erb
index
6f6cbe5
..
0934738
100644
(file)
--- a/
modules/postfix/templates/main.cf-header.erb
+++ b/
modules/postfix/templates/main.cf-header.erb
@@
-4,12
+4,12
@@
mydomain = debian.org
compatibility_level = 2
smtp_dns_support_level = dnssec
compatibility_level = 2
smtp_dns_support_level = dnssec
-<%- if scope.lookupvar('deprecated::nodeinfo')['smarthost'].empty? -%>
-smtp_tls_security_level = dane
-<%- else -%>
+<%- if @use_smarthost -%>
smtp_tls_security_level = dane-only
# yes, do MX lookups on the relayhost, since those have TLSA records
smtp_tls_security_level = dane-only
# yes, do MX lookups on the relayhost, since those have TLSA records
-relayhost = <%= scope.lookupvar('deprecated::nodeinfo')['smarthost'] %>:submission
+relayhost = <%= @smarthost %>:submission
+<%- else -%>
+smtp_tls_security_level = dane
<%- end -%>
# tls stuff
<%- end -%>
# tls stuff