X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f601fd4a5494b22aba8edc3085a338feb67a9a2e..999bb719868d83e42b0795dd5faa35f6af5e46aa:/cookbooks/ssl/recipes/default.rb

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index 81dea8b28..976db154b 100644
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -18,30 +18,34 @@
 #
 
 keys = data_bag_item("ssl", "keys")
+certs = data_bag_item("ssl", "certs")
 
 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 0o444
+    backup false
+  end
 end
 
-[ "openstreetmap", "tile.openstreetmap" ].each do |certificate|
+["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate|
   if node[:ssl][:certificates].include?(certificate)
-    cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
+    file "/etc/ssl/certs/#{certificate}.pem" do
       owner "root"
       group "root"
-      mode 0444
+      mode 0o444
+      content certs[certificate].join("\n")
       backup false
     end
 
     file "/etc/ssl/private/#{certificate}.key" do
       owner "root"
       group "ssl-cert"
-      mode 0440
+      mode 0o440
       content keys[certificate].join("\n")
       backup false
     end