Merge pull request #138 from palfrey/relay-restrictions-maps

Fix use_relay_restrictions_maps
This commit is contained in:
Tim Smith 2017-06-26 22:06:51 -07:00 committed by GitHub
commit 65f6be0dea
2 changed files with 4 additions and 1 deletions

View File

@ -90,6 +90,9 @@ suites:
- name: server
run_list:
- recipe[postfix::server]
attributes:
postfix:
use_relay_restrictions_maps: "yes"
- name: sasl_auth
run_list:

View File

@ -59,7 +59,7 @@ if node['postfix']['use_virtual_aliases_domains']
end
if node['postfix']['use_relay_restrictions_maps']
default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject"
node.default_unless['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject"
end
if node['postfix']['master']['maildrop']['active']