X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..2d43acf0477a2dbf2efaed7480d0d73454d8196e:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 9c687a3c9..1bbd084ee 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -61,14 +61,14 @@ end relay_to_domains = node[:exim][:relay_to_domains] node[:exim][:routes].each_value do |route| - relay_to_domains = relay_to_domains | route[:domains] if route[:host] + relay_to_domains |= route[:domains] if route[:host] end relay_from_hosts = node[:exim][:relay_from_hosts] if node[:exim][:smarthost_name] search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host| - relay_from_hosts = relay_from_hosts | host.ipaddresses(:role => :external) + relay_from_hosts |= host.ipaddresses(:role => :external) end end @@ -144,7 +144,7 @@ else end end -if node[:exim][:smarthost_via] +if node[:exim][:smarthost_via] # ~FC023 firewall_rule "deny-outbound-smtp" do action :reject source "fw"