X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/98ea514d038d736d5e8f19fa3eafe1fdab2c5e11..6fdba5edc17c0ccbb5dc3bd15690dcba6708e1fe:/cookbooks/ssl/recipes/default.rb diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb index 1635ed24d..328ba8bab 100644 --- a/cookbooks/ssl/recipes/default.rb +++ b/cookbooks/ssl/recipes/default.rb @@ -17,13 +17,10 @@ # limitations under the License. # -keys = data_bag_item("ssl", "keys") -certs = data_bag_item("ssl", "certs") - package "openssl" package "ssl-cert" -%w(letsencrypt rapidssl startcom dhparam).each do |certificate| +%w(letsencrypt dhparam).each do |certificate| cookbook_file "/etc/ssl/certs/#{certificate}.pem" do owner "root" group "root" @@ -31,31 +28,3 @@ package "ssl-cert" backup false end end - -["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate| - if node[:ssl][:certificates].include?(certificate) - file "/etc/ssl/certs/#{certificate}.pem" do - owner "root" - group "root" - mode 0o444 - content certs[certificate].join("\n") - 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/#{certificate}.key" do - action :delete - end - end -end