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 25ff1c1b8ad278663bbb8e8f35791154e9793ac8..1e333b42cc34ac39f72fe0989d78260fc381b8cd 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -32,12 +32,22 @@ group "ssl-cert" do
   append true
 end
 
+template "/tmp/exim.ssl.cnf" do
+  source "ssl.cnf.erb"
+  owner "root"
+  group "root"
+  mode 0644
+   not_if do
+    File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key")
+  end 
+end
+
 execute "/etc/ssl/certs/exim.pem" do
-  command "openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/private/exim.key -out /etc/ssl/certs/exim.pem -days 3650 -nodes -subj='/O=OpenStreetMap/CN=#{node[:name]}'"
+  command "openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/private/exim.key -out /etc/ssl/certs/exim.pem -days 3650 -nodes -config /tmp/exim.ssl.cnf"
   user "root"
   group "ssl-cert"
   not_if do
-    File.exists?("/etc/ssl/certs/exim.pem") && File.exists?("/etc/ssl/private/exim.key")
+    File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key")
   end
 end
 
@@ -50,7 +60,7 @@ end
 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]
@@ -68,7 +78,14 @@ template "/etc/exim4/exim4.conf" do
   mode 0644
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
-  notifies :restart, resources(:service => "exim4")
+  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|