X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3e091ef3d515a094fd4493faacbc5c3ba266c2ad..e0e20480e31ea1be619d89a7d674edf02d6c8208:/cookbooks/letsencrypt/recipes/default.rb diff --git a/cookbooks/letsencrypt/recipes/default.rb b/cookbooks/letsencrypt/recipes/default.rb index a2c42e1c5..5bc9e3313 100644 --- a/cookbooks/letsencrypt/recipes/default.rb +++ b/cookbooks/letsencrypt/recipes/default.rb @@ -8,7 +8,7 @@ # 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, @@ -121,7 +121,11 @@ directory "/srv/acme.openstreetmap.org/requests" do end certificates = search(:node, "letsencrypt:certificates").each_with_object({}) do |n, c| - c.merge!(n[:letsencrypt][:certificates]) + n[:letsencrypt][:certificates].each do |name, details| + c[name] ||= details.merge(:nodes => []) + + c[name][:nodes] << { :name => n[:fqdn], :address => n.external_ipaddress } + end end certificates.each do |name, details|