X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/32a423888e0d6b5254c55e4faf418b31749dc69e..90a99a9591ff08a70463403ad1dba1a2d7939881:/cookbooks/letsencrypt/recipes/default.rb

diff --git a/cookbooks/letsencrypt/recipes/default.rb b/cookbooks/letsencrypt/recipes/default.rb
index f3ddd9712..34e9be8f7 100644
--- a/cookbooks/letsencrypt/recipes/default.rb
+++ b/cookbooks/letsencrypt/recipes/default.rb
@@ -21,8 +21,10 @@ include_recipe "apache"
 
 keys = data_bag_item("chef", "keys")
 
-package "certbot"
-package "ruby"
+package %w[
+  certbot
+  ruby
+]
 
 directory "/etc/letsencrypt" do
   owner "letsencrypt"
@@ -119,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[:ipaddress] }
+  end
 end
 
 certificates.each do |name, details|
@@ -141,6 +147,14 @@ certificates.each do |name, details|
   end
 end
 
+template "/srv/acme.openstreetmap.org/bin/check-certificates" do
+  source "check-certificates.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+  variables :certificates => certificates
+end
+
 template "/etc/cron.d/letsencrypt" do
   source "cron.erb"
   owner "root"