Merge branch 'master' into feature/16-ipfs

site-cookbooks/5apps-xmpp_server/recipes/letsencrypt.rb

@@ -1,11 +1,14 @@
 # nginx config to generate a Let's Encrypt cert
 
+include_recipe "kosmos-base::letsencrypt"
+
 root_directory = "/var/www/xmpp.5apps.com"
 
-directory root_directory do
+directory "#{root_directory}/.well-known" do
   owner node["nginx"]["user"]
   group node["nginx"]["group"]
   action :create
+  recursive true
 end
 
 template "#{node['nginx']['dir']}/sites-available/xmpp.5apps.com" do
@@ -19,11 +22,16 @@ template "#{node['nginx']['dir']}/sites-available/xmpp.5apps.com" do
   notifies :reload, 'service[nginx]', :delayed
 end
 
+# 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 xmpp.5apps.com" do
   command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{root_directory} -d xmpp.5apps.com -n"
   cwd "/usr/local/certbot"
-  not_if { File.exist? "/etc/letsencrypt/live/xmpp.5apps.com/fullchain.pem" }
-  notifies :reload, "service[nginx]", :delayed
+  only_if do
+    File.exist?("#{node['nginx']['dir']}/sites-enabled/xmpp.5apps.com") &&
+      ! File.exist?("/etc/letsencrypt/live/xmpp.5apps.com/fullchain.pem")
+  end
+  notifies :create, "template[#{node['nginx']['dir']}/sites-available/xmpp.5apps.com]", :delayed
   notifies :run, "execute[copy the tls cert to prosody folder]", :delayed
 end
 

site-cookbooks/kosmos-base/metadata.rb

@@ -8,7 +8,6 @@ version          '0.1.1'
 
 depends 'unattended-upgrades'
 depends 'users'
-depends 'chef-solo-search'
 depends 'sudo'
 depends 'kosmos-postfix'
 depends 'hostname'

site-cookbooks/kosmos-base/recipes/default.rb

@@ -2,14 +2,14 @@
 # Cookbook Name:: kosmos-base
 # Recipe:: default
 #
-# Copyright 2015, Kosmos
+# Copyright 2017, Kosmos
 #
 # All rights reserved - Do Not Redistribute
 #
 
 include_recipe 'timezone-ii'
 
-node.override['omnibus_updater']['version']              = '12.17.44'
+node.override['omnibus_updater']['version']              = '12.19.36'
 node.override['omnibus_updater']['kill_chef_on_upgrade'] = false
 include_recipe 'omnibus_updater'
 
@@ -22,7 +22,12 @@ package 'ruby2.1-dev'
 
 package 'mosh'
 
-include_recipe 'users::sysadmins'
+# Searches data bag "users" for groups attribute "sysadmin".
+# Places returned users in Unix group "sysadmin" with GID 2300.
+users_manage 'sysadmin' do
+  group_id 2300
+  action [:remove, :create]
+end
 
 node.override['authorization']['sudo']['passwordless'] = true
 include_recipe 'sudo'