Work around issues with older openssl on Ubuntu
authorTom Hughes <tom@compton.nu>
Thu, 17 Oct 2013 18:00:27 +0000 (19:00 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 17 Oct 2013 18:01:43 +0000 (19:01 +0100)
cookbooks/exim/recipes/default.rb
cookbooks/exim/templates/default/ssl.cnf.erb [new file with mode: 0644]

index 25ff1c1b8ad278663bbb8e8f35791154e9793ac8..219629f592a997e3a14c04c863694732fb3a6b96 100644 (file)
@@ -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 (file)
index 0000000..406dcb9
--- /dev/null
@@ -0,0 +1,8 @@
+[req]
+prompt = no
+distinguished_name = req_dn
+
+[req_dn]
+organizationName = OpenStreetMap
+commonName = <%= node[:fqdn] %>
+emailAddress = postmaster@openstreetmap.org