Merge branch 'master' into feature/ubuntu-16.04

site-cookbooks/sockethub/recipes/proxy.rb

@@ -2,27 +2,31 @@
 # Cookbook Name:: sockethub
 # Recipe:: proxy
 #
-# Copyright 2015, Kosmos
+# Copyright 2015-2017, Kosmos
 #
 # All rights reserved - Do Not Redistribute
 #
 
-firewall_rule 'sockethub' do
-  port     node['sockethub']['external_port'].to_i
-  protocol :tcp
-  command  :allow
+unless node.chef_environment == "development"
+  include_recipe "kosmos-base::letsencrypt"
+
+  include_recipe "firewall"
+  firewall_rule 'sockethub' do
+    port     node['sockethub']['external_port'].to_i
+    protocol :tcp
+    command  :allow
+  end
 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'
-
 template "#{node['nginx']['dir']}/sites-available/sockethub" do
   source 'nginx_conf_sockethub.erb'
   owner 'www-data'