X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/98ea514d038d736d5e8f19fa3eafe1fdab2c5e11..f71ac318c6866183a879adda1c7ecef007a74924:/cookbooks/ssl/recipes/default.rb diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb index 1635ed24d..17bb6339e 100644 --- a/cookbooks/ssl/recipes/default.rb +++ b/cookbooks/ssl/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: ssl +# Cookbook:: ssl # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,45 +17,12 @@ # 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| - cookbook_file "/etc/ssl/certs/#{certificate}.pem" do - owner "root" - group "root" - mode 0o444 - 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 +cookbook_file "/etc/ssl/certs/dhparam.pem" do + owner "root" + group "root" + mode "444" + backup false end