From: Tom Hughes <tom@compton.nu>
Date: Thu, 17 Oct 2013 18:00:27 +0000 (+0100)
Subject: Work around issues with older openssl on Ubuntu
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/cd67ea35139fb5d661639160ae3cdd8b9a1bbb02?ds=sidebyside

Work around issues with older openssl on Ubuntu
---

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 25ff1c1b8..219629f59 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
 
diff --git a/cookbooks/exim/templates/default/ssl.cnf.erb b/cookbooks/exim/templates/default/ssl.cnf.erb
new file mode 100644
index 000000000..406dcb94a
--- /dev/null
+++ b/cookbooks/exim/templates/default/ssl.cnf.erb
@@ -0,0 +1,8 @@
+[req]
+prompt = no
+distinguished_name = req_dn
+
+[req_dn]
+organizationName = OpenStreetMap
+commonName = <%= node[:fqdn] %>
+emailAddress = postmaster@openstreetmap.org