X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/47de5772657bc8ab28e7c1aae082f0d25cd045e8..4166e6d35cf8c114805a3da2f8b39ad1f26de6df:/cookbooks/spamassassin/recipes/default.rb diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb index 6c64083b8..dd1e19eb1 100644 --- a/cookbooks/spamassassin/recipes/default.rb +++ b/cookbooks/spamassassin/recipes/default.rb @@ -20,7 +20,7 @@ package "spamassassin" service "spamassassin" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -42,11 +42,11 @@ trusted_networks = node[:exim][:relay_from_hosts] if node[:exim][:smarthost_name] search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host| - trusted_networks = trusted_networks | host.ipaddresses(:role => :external) + trusted_networks |= host.ipaddresses(:role => :external) end end -trusted_networks = trusted_networks - [ "127.0.0.1", "::1" ] +trusted_networks -= ["127.0.0.1", "::1"] template "/etc/spamassassin/local.cf" do source "local.cf.erb"