Create a nginx_certbot_site resource to remove duplication

It creates a folder, the nginx vhost for certbot and HTTP redirects, and
also runs certbot and recreates the nginx vhost that includes the TLS
cert

site-cookbooks/sockethub/recipes/proxy.rb

@@ -2,14 +2,12 @@
 # Cookbook Name:: sockethub
 # Recipe:: proxy
 #
-# Copyright 2015-2017, Kosmos
+# Copyright 2015-2019, Kosmos
 #
 # All rights reserved - Do Not Redistribute
 #
 
 unless node.chef_environment == "development"
-  include_recipe "kosmos-base::letsencrypt"
-
   include_recipe "firewall"
   firewall_rule 'sockethub' do
     port     node['sockethub']['external_port'].to_i
@@ -19,36 +17,27 @@ unless node.chef_environment == "development"
 end
 
 include_recipe 'kosmos-nginx'
+server_name = node['sockethub']['nginx']['server_name']
 
-directory "/var/www/sockethub" do
-  owner     node["nginx"]["user"]
-  group     node["nginx"]["group"]
-  action    :create
-  recursive true
-end
-
-template "#{node['nginx']['dir']}/sites-available/sockethub" do
+template "#{node['nginx']['dir']}/sites-available/#{server_name}" do
   source 'nginx_conf_sockethub.erb'
   owner 'www-data'
   mode 0640
   variables sockethub_port:          node['sockethub']['port'],
             sockethub_external_port: node['sockethub']['external_port'],
-            server_name:             'sockethub.kosmos.org',
-            ssl_cert:                "/etc/letsencrypt/live/sockethub.kosmos.org/fullchain.pem",
-            ssl_key:                 "/etc/letsencrypt/live/sockethub.kosmos.org/privkey.pem"
+            server_name:             server_name,
+            ssl_cert:                "/etc/letsencrypt/live/#{server_name}/fullchain.pem",
+            ssl_key:                 "/etc/letsencrypt/live/#{server_name}/privkey.pem"
   notifies :reload, 'service[nginx]', :delayed
 end
 
-unless node.chef_environment == "development"
-  include_recipe "kosmos-base::letsencrypt"
-
-  execute "letsencrypt cert for sockethub.kosmos.org" do
-    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
+# Legacy vhost
+nginx_site "sockethub" do
+  action :disable
 end
 
-nginx_site 'sockethub' do
-  enable true
+nginx_site server_name do
+  action :enable
 end
+
+nginx_certbot_site server_name