X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/016a0bfc82d1fc27def4135f1a429c5022fe7edf..b3b90ac434a01ab3f6eec2fa0650d2a9d210eded:/cookbooks/exim/recipes/default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 65ab8342f..6b20f5181 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -33,23 +33,15 @@ group "ssl-cert" do
   append true
 end
 
-template "/tmp/exim.ssl.cnf" do
-  source "ssl.cnf.erb"
+openssl_x509_certificate "/etc/ssl/certs/exim.pem" do
+  key_file "/etc/ssl/private/exim.key"
   owner "root"
-  group "root"
-  mode 0o644
-  not_if do
-    File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/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.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
-  end
+  mode 0o640
+  org "OpenStreetMap"
+  email "postmaster@openstreetmap.org"
+  common_name node[:fqdn]
+  expire 3650
 end
 
 service "exim4" do