X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..df6b53394011fe72217ac3019daeef975430b2c8:/cookbooks/ssl/recipes/default.rb?ds=inline diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb index c2e62d228..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,41 +17,12 @@ # limitations under the License. # -keys = data_bag_item("ssl", "keys") - package "openssl" package "ssl-cert" -cookbook_file "/etc/ssl/certs/rapidssl.pem" do +cookbook_file "/etc/ssl/certs/dhparam.pem" do owner "root" group "root" - mode 0444 + mode "444" backup false end - -["openstreetmap", "tile.openstreetmap", "crm.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/#{certificate}.key" do - action :delete - end - end -end