Revert "Take thorn-03 out of production"

[chef.git] / cookbooks / exim / recipes / default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 9c687a3c9cdc118e119d96a1e417b474264bc79e..1bbd084ee5cd0319f98340efb28320cde7ed0c25 100644 (file)
--- 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"