diff --git a/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb b/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb index cfbe366..7c31d97 100644 --- a/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb +++ b/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb @@ -34,13 +34,6 @@ file "/etc/letsencrypt/renewal-hooks/post/prosody" do group "root" end -gandi_api_data_bag_item = data_bag_item('credentials', 'gandi_api_5apps') - -template "/root/letsencrypt_hook.sh" do - variables gandi_api_key: gandi_api_data_bag_item["key"] - mode 0770 -end - # Generate a Let's Encrypt cert (only if no cert has been generated before). # The renew cron will take care of renewing execute "letsencrypt cert for 5apps xmpp" do diff --git a/site-cookbooks/kosmos-base/recipes/letsencrypt.rb b/site-cookbooks/kosmos-base/recipes/letsencrypt.rb index d97dbe7..b0c8f3d 100644 --- a/site-cookbooks/kosmos-base/recipes/letsencrypt.rb +++ b/site-cookbooks/kosmos-base/recipes/letsencrypt.rb @@ -25,3 +25,10 @@ systemctl reload nginx owner "root" group "root" end + +gandi_api_data_bag_item = data_bag_item('credentials', 'gandi_api_5apps') + +template "/root/gandi_dns_certbot_hook.sh" do + variables gandi_api_key: gandi_api_data_bag_item["key"] + mode 0770 +end diff --git a/site-cookbooks/5apps-xmpp_server/templates/default/letsencrypt_hook.sh.erb b/site-cookbooks/kosmos-base/templates/default/gandi_dns_certbot_hook.sh.erb similarity index 100% rename from site-cookbooks/5apps-xmpp_server/templates/default/letsencrypt_hook.sh.erb rename to site-cookbooks/kosmos-base/templates/default/gandi_dns_certbot_hook.sh.erb