From 36e046ea7344a4a008e525fc91e3719b3c29a329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 14 Mar 2019 10:52:44 +0100 Subject: [PATCH] Run certbot using the binary provided by the Ubuntu PPA --- site-cookbooks/5apps-hubot/recipes/xmpp_schlupp.rb | 3 +-- .../5apps-xmpp_server/recipes/letsencrypt.rb | 3 +-- site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb | 3 +-- site-cookbooks/kosmos-ipfs/recipes/letsencrypt.rb | 3 +-- site-cookbooks/kosmos-mastodon/recipes/nginx.rb | 3 +-- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 10 +--------- site-cookbooks/kosmos-parity/recipes/letsencrypt.rb | 3 +-- site-cookbooks/kosmos-wordpress/recipes/nginx.rb | 3 +-- site-cookbooks/sockethub/recipes/proxy.rb | 3 +-- 9 files changed, 9 insertions(+), 25 deletions(-) diff --git a/site-cookbooks/5apps-hubot/recipes/xmpp_schlupp.rb b/site-cookbooks/5apps-hubot/recipes/xmpp_schlupp.rb index f35ec1e..26dcf84 100644 --- a/site-cookbooks/5apps-hubot/recipes/xmpp_schlupp.rb +++ b/site-cookbooks/5apps-hubot/recipes/xmpp_schlupp.rb @@ -143,8 +143,7 @@ end unless node.chef_environment == "development" execute "letsencrypt cert for #{express_domain}" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{express_domain} -d #{express_domain} -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{express_domain} -d #{express_domain} -n" not_if { File.exist? "/etc/letsencrypt/live/#{express_domain}/fullchain.pem" } notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{express_domain}]", :immediately end diff --git a/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb b/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb index 9215fa8..ec800b6 100644 --- a/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb +++ b/site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb @@ -12,8 +12,7 @@ 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 - command "./certbot-auto certonly --manual --preferred-challenges dns --manual-public-ip-logging-ok --agree-tos --manual-auth-hook \"/root/letsencrypt_hook.sh auth\" --manual-cleanup-hook \"/root/letsencrypt_hook.sh cleanup\" --deploy-hook letsencrypt_renew_hook --email ops@5apps.com -d 5apps.com -d muc.5apps.com -d xmpp.5apps.com -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --manual --preferred-challenges dns --manual-public-ip-logging-ok --agree-tos --manual-auth-hook \"/root/letsencrypt_hook.sh auth\" --manual-cleanup-hook \"/root/letsencrypt_hook.sh cleanup\" --deploy-hook letsencrypt_renew_hook --email ops@5apps.com -d 5apps.com -d muc.5apps.com -d xmpp.5apps.com -n" not_if do File.exist?("/etc/prosody/certs/5apps.com.crt") end diff --git a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb index 3eb9433..55f4875 100644 --- a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb +++ b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb @@ -122,8 +122,7 @@ unless node.chef_environment == "development" # reloaded after adding the vhost or sth, because it does work on the second # run. execute "letsencrypt cert for #{express_domain}" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{express_domain} -d #{express_domain} -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{express_domain} -d #{express_domain} -n" not_if { File.exist? "/etc/letsencrypt/live/#{express_domain}/fullchain.pem" } notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{express_domain}]", :immediately end diff --git a/site-cookbooks/kosmos-ipfs/recipes/letsencrypt.rb b/site-cookbooks/kosmos-ipfs/recipes/letsencrypt.rb index 65839d7..2f3e396 100644 --- a/site-cookbooks/kosmos-ipfs/recipes/letsencrypt.rb +++ b/site-cookbooks/kosmos-ipfs/recipes/letsencrypt.rb @@ -52,8 +52,7 @@ unless node.chef_environment == "development" # Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert # has been generated before. The renew cron will take care of renewing execute "letsencrypt cert for ipfs.kosmos.org" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{root_directory} -d ipfs.kosmos.org -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{root_directory} -d ipfs.kosmos.org -n" only_if do File.exist?("#{node['nginx']['dir']}/sites-enabled/ipfs.kosmos.org") && !File.exist?("/etc/letsencrypt/live/ipfs.kosmos.org/fullchain.pem") diff --git a/site-cookbooks/kosmos-mastodon/recipes/nginx.rb b/site-cookbooks/kosmos-mastodon/recipes/nginx.rb index 6db9868..6c83aff 100644 --- a/site-cookbooks/kosmos-mastodon/recipes/nginx.rb +++ b/site-cookbooks/kosmos-mastodon/recipes/nginx.rb @@ -39,8 +39,7 @@ end unless node.chef_environment == "development" include_recipe "kosmos-base::letsencrypt" execute "letsencrypt cert for #{server_name}" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/mastodon -d #{server_name} -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/mastodon -d #{server_name} -n" not_if { File.exist? "/etc/letsencrypt/live/#{server_name}/fullchain.pem" } notifies :create, "template[#{node['nginx']['dir']}/sites-available/mastodon]", :immediately end diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index 009e019..9a3a8db 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -63,15 +63,7 @@ unless node.chef_environment == "development" include_recipe "kosmos-base::letsencrypt" execute "letsencrypt cert for wiki.kosmos.org" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node['mediawiki']['docroot_dir']} -d wiki.kosmos.org -n" - cwd "/usr/local/certbot" - not_if { File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" } - notifies :reload, "service[nginx]", :delayed - end - - execute "letsencrypt cert for wiki.kosmos.org" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node["mediawiki"]["docroot_dir"]} -d wiki.kosmos.org -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node['mediawiki']['docroot_dir']} -d wiki.kosmos.org -n" not_if { File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" } notifies :reload, "service[nginx]", :delayed end diff --git a/site-cookbooks/kosmos-parity/recipes/letsencrypt.rb b/site-cookbooks/kosmos-parity/recipes/letsencrypt.rb index fdb84a1..1791052 100644 --- a/site-cookbooks/kosmos-parity/recipes/letsencrypt.rb +++ b/site-cookbooks/kosmos-parity/recipes/letsencrypt.rb @@ -33,8 +33,7 @@ nginx_site "#{hostname}" do end execute "letsencrypt cert for #{hostname}" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{hostname} -d #{hostname} -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/#{hostname} -d #{hostname} -n" not_if { File.exist? "/etc/letsencrypt/live/#{hostname}/fullchain.pem" } notifies :reload, "service[nginx]", :delayed end diff --git a/site-cookbooks/kosmos-wordpress/recipes/nginx.rb b/site-cookbooks/kosmos-wordpress/recipes/nginx.rb index 6d04427..60c5c56 100644 --- a/site-cookbooks/kosmos-wordpress/recipes/nginx.rb +++ b/site-cookbooks/kosmos-wordpress/recipes/nginx.rb @@ -38,8 +38,7 @@ unless node.chef_environment == "development" include_recipe "kosmos-base::letsencrypt" execute "letsencrypt cert for blog.kosmos.org" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node['wordpress']['dir']} -d blog.kosmos.org -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node['wordpress']['dir']} -d blog.kosmos.org -n" not_if { File.exist? "/etc/letsencrypt/live/blog.kosmos.org/fullchain.pem" } notifies :reload, "service[nginx]", :delayed end diff --git a/site-cookbooks/sockethub/recipes/proxy.rb b/site-cookbooks/sockethub/recipes/proxy.rb index 7d5a3ba..fd7660b 100644 --- a/site-cookbooks/sockethub/recipes/proxy.rb +++ b/site-cookbooks/sockethub/recipes/proxy.rb @@ -43,8 +43,7 @@ unless node.chef_environment == "development" include_recipe "kosmos-base::letsencrypt" execute "letsencrypt cert for sockethub.kosmos.org" do - command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/sockethub -d sockethub.kosmos.org -n" - cwd "/usr/local/certbot" + command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/sockethub -d sockethub.kosmos.org -n" not_if { File.exist? "/etc/letsencrypt/live/sockethub.kosmos.org/fullchain.pem" } notifies :reload, "service[nginx]", :delayed end