X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8eb231729d6b7e7911668f512b270dadd6223bba..62e4ecb57749d4c45eeed2fc5e8bba1fac2f92bc:/cookbooks/ssl/recipes/default.rb diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb index a3a2708c4..33c9bcb14 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 0o444 + backup false + end end -cookbook_file "/etc/ssl/certs/#{node[:ssl][:certificate]}.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 0o444 + backup false + end + + file "/etc/ssl/private/#{certificate}.key" do + owner "root" + group "ssl-cert" + mode 0o440 + content keys[certificate].join("\n") + backup false + end + else + file "/etc/ssl/certs/#{certificate}.pem" do + action :delete + end -file "/etc/ssl/private/#{node[:ssl][:certificate]}.key" do - owner "root" - group "ssl-cert" - mode 0440 - content keys[node[:ssl][:certificate]].join("\n") - backup false + file "/etc/ssl/private/#{certificate}.key" do + action :delete + end + end end