X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8ea4e1fa9dbc556bfbcd7352c61cbd872ff96f84..cd67ea35139fb5d661639160ae3cdd8b9a1bbb02:/cookbooks/exim/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index b5b15080c..219629f59 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -18,9 +18,9 @@
 #
 
 include_recipe "networking"
-include_recipe "ssl"
 
 package "exim4"
+package "openssl"
 
 if File.exist?("/var/run/clamav/clamd.ctl")
   package "exim4-daemon-heavy"
@@ -32,11 +32,29 @@ 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 -config /tmp/exim.ssl.cnf"
+  user "root"
+  group "ssl-cert"
+  not_if do
+    File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key")
+  end
+end
+
 service "exim4" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/openstreetmap.pem")
-  subscribes :restart, resources(:file => "/etc/ssl/private/openstreetmap.key")
+  subscribes :restart, "execute[/etc/ssl/certs/exim.pem]"
 end
 
 relay_to_domains = node[:exim][:relay_to_domains]