Only add a domein to relay_to_domains if we are really relaying to it

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 61731d8e463cd6fa2589abbd069a8ea31901afc7..1e333b42cc34ac39f72fe0989d78260fc381b8cd 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -60,7 +60,7 @@ end
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|

-  relay_to_domains = relay_to_domains | route[:domains]
+  relay_to_domains = relay_to_domains | route[:domains] if route[:host]

 end
 
 relay_from_hosts = node[:exim][:relay_from_hosts]
 end
 
 relay_from_hosts = node[:exim][:relay_from_hosts]


@@ -81,6 +81,13 @@ template "/etc/exim4/exim4.conf" do
   notifies :restart, "service[exim4]"
 end
 
   notifies :restart, "service[exim4]"
 end
 

+template "/etc/exim4/callout_exempt_senders" do
+  source "callout_exempt_senders.erb"
+  owner "root"
+  group "Debian-exim"
+  mode 0644
+end
+

 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}