diff --git a/site-cookbooks/sockethub/recipes/proxy.rb b/site-cookbooks/sockethub/recipes/proxy.rb index 88025da..c1fb46c 100644 --- a/site-cookbooks/sockethub/recipes/proxy.rb +++ b/site-cookbooks/sockethub/recipes/proxy.rb @@ -2,14 +2,14 @@ # Cookbook Name:: sockethub # Recipe:: proxy # -# Copyright 2015, Kosmos +# Copyright 2015-2017, Kosmos # # All rights reserved - Do Not Redistribute # -include_recipe "kosmos-base::letsencrypt" - unless node.chef_environment == "development" + include_recipe "kosmos-base::letsencrypt" + include_recipe "firewall" firewall_rule 'sockethub' do port node['sockethub']['external_port'].to_i @@ -21,9 +21,10 @@ end include_recipe 'kosmos-nginx' directory "/var/www/sockethub" do - owner node["nginx"]["user"] - group node["nginx"]["group"] - action :create + owner node["nginx"]["user"] + group node["nginx"]["group"] + action :create + recursive true end include_recipe 'kosmos-nginx' @@ -40,11 +41,13 @@ template "#{node['nginx']['dir']}/sites-available/sockethub" do notifies :reload, 'service[nginx]', :delayed end -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" - not_if { File.exist? "/etc/letsencrypt/live/sockethub.kosmos.org/fullchain.pem" } - notifies :reload, "service[nginx]", :delayed +unless node.chef_environment == "development" + 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" + not_if { File.exist? "/etc/letsencrypt/live/sockethub.kosmos.org/fullchain.pem" } + notifies :reload, "service[nginx]", :delayed + end end nginx_site 'sockethub' do