X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/900be9a12bfe74cfb4c96e00b892d350a18eb635..a615c8af6b389f613acf1c80a7b56da48d780cc0:/cookbooks/exim/recipes/default.rb?ds=inline

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 25ff1c1b8..06bc08540 100644
--- 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
 
@@ -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|