X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..3dd8db9fac8442e4f32fa3a55e7b68c27ece526a:/cookbooks/ssl/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index 4bbcea471..f737fe1a6 100644
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -22,24 +22,38 @@ keys = data_bag_item("ssl", "keys")
 package "openssl"
 package "ssl-cert"
 
-cookbook_file "/etc/ssl/certs/rapidssl.pem" do
-  owner "root"
-  group "root"
-  mode 0444
-  backup false
+%w(rapidssl startcom dhparam).each do |certificate|
+  cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
+    owner "root"
+    group "root"
+    mode 0444
+    backup false
+  end
 end
 
-cookbook_file "/etc/ssl/certs/openstreetmap.pem" do
-  owner "root"
-  group "root"
-  mode 0444
-  backup false
-end
+["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate|
+  if node[:ssl][:certificates].include?(certificate)
+    cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
+      owner "root"
+      group "root"
+      mode 0444
+      backup false
+    end
+
+    file "/etc/ssl/private/#{certificate}.key" do
+      owner "root"
+      group "ssl-cert"
+      mode 0440
+      content keys[certificate].join("\n")
+      backup false
+    end
+  else
+    file "/etc/ssl/certs/#{certificate}.pem" do
+      action :delete
+    end
 
-file "/etc/ssl/private/openstreetmap.key" do
-  owner "root"
-  group "ssl-cert"
-  mode 0440
-  content keys["openstreetmap"].join("\n")
-  backup false
+    file "/etc/ssl/private/#{certificate}.key" do
+      action :delete
+    end
+  end
 end