From f7c66b9de3f2ffe7366a21aab1557ff61df463d0 Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Tue, 20 Jun 2017 22:37:07 +0100 Subject: [PATCH 1/2] Add use_relay_restrictions_maps to server config for Dokken Signed-off-by: Tom Parker --- .kitchen.dokken.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml index b2c88e5..53963e3 100644 --- a/.kitchen.dokken.yml +++ b/.kitchen.dokken.yml @@ -90,6 +90,9 @@ suites: - name: server run_list: - recipe[postfix::server] + attributes: + postfix: + use_relay_restrictions_maps: "yes" - name: sasl_auth run_list: From daca56f8c974f0187b5404eff8633758829d10b8 Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Tue, 20 Jun 2017 22:50:00 +0100 Subject: [PATCH 2/2] Correct attribute line for use_relay_restrictions_maps Signed-off-by: Tom Parker --- recipes/_attributes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/_attributes.rb b/recipes/_attributes.rb index f3ffe6e..d8f2535 100644 --- a/recipes/_attributes.rb +++ b/recipes/_attributes.rb @@ -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']