Merge pull request #65 from TalkingQuickly/feature/2021-upgrade

Ubuntu 20.04 Compatibility

.gitignore

@@ -4,3 +4,6 @@ cookbooks/**/*
 .ruby-gemset
 .vagrant
 berks-cookbooks/
+nodes/test*
+clients/*.json
+.chef

Berksfile

@@ -3,9 +3,6 @@ source "https://api.berkshelf.com"
 # cookbook 'apt', github: 'opscode-cookbooks/apt'
 cookbook 'apt-chef', '~> 1.0.0'
 
-#cookbook 'build-essential', github: 'opscode-cookbooks/build-essential'
-cookbook 'build-essential'
-
 # cookbook 'fail2ban', github: 'opscode-cookbooks/fail2ban'
 cookbook 'fail2ban', '~> 2.3.0'
 
@@ -14,33 +11,32 @@ cookbook 'hostnames', '= 0.3.1'
 
 cookbook 'locale', '~> 1.1.0'
 
-#cookbook 'memcached', github: 'opscode-cookbooks/memcached'
-cookbook 'memcached', '~> 3.0.0'
+cookbook 'memcached', '~> 6.1.0'
 
 #cookbook 'mysql', github: 'opscode-cookbooks/mysql'
 cookbook 'mysql', '~> 5.6.3'
 
-#cookbook 'ntp', github: 'gmiranda23/ntp'
-cookbook 'ntp', '~> 2.0.0'
+cookbook 'ntp', '~> 3.7.0'
 
 #cookbook 'openssh', github: 'opscode-cookbooks/openssh'
 cookbook 'openssh', '= 1.2.2'
 
-cookbook 'postgresql', '~> 4.0.6'
+cookbook 'postgresql', '~> 8.2.1'
 
 # cookbook 'sudo', github: 'opscode-cookbooks/sudo'
 cookbook 'sudo', '~> 2.9.0'
 
-# cookbook 'ufw', github: 'opscode-cookbooks/ufw'
-cookbook 'ufw', '~> 1.0.0'
-cookbook 'firewall', '~> 2.5.2'
+cookbook 'ufw', '~> 3.2.1'
+cookbook 'firewall', '~> 2.7.0'
+
+cookbook 'nginx', '~> 11.4.0'
 
-cookbook 'nginx', github: 'miketheman/nginx'
+cookbook 'users', '~> 5.5.0'
 
-cookbook 'users', '~> 2.0.3'
+cookbook 'ruby_build', '~> 2.1.1'
+cookbook 'ruby_rbenv', github: 'sous-chefs/ruby_rbenv'
 
-cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq'
-cookbook 'ruby_rbenv', github: 'fnichol/chef-rbenv'
-cookbook 'redis-server', github: 'TalkingQuickly/redis-server'
-cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master'
-cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'
+cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq', tag: '1.0.0'
+cookbook 'redisio', '~> 4.2.0'
+cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', tag: '0.5.0'
+cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', tag: '1.0.0'

Berksfile.lock

@@ -1,111 +1,83 @@
 DEPENDENCIES
   apt-chef (~> 1.0.0)
-  build-essential
   fail2ban (~> 2.3.0)
-  firewall (~> 2.5.2)
+  firewall (~> 2.7.0)
   hostnames (= 0.3.1)
   locale (~> 1.1.0)
-  memcached (~> 3.0.0)
+  memcached (~> 6.1.0)
   monit-tlq
-    git: git://github.com/TalkingQuickly/monit-tlq.git
-    revision: 28bbdc06702a00c5cb5ace1fd7f79a51a127ed0c
-    branch: master
+    git: https://github.com/TalkingQuickly/monit-tlq.git
+    revision: 0716844d44766f302d9185b0e76fb4e2e162ce85
+    tag: 0.5.0
   monit_configs-tlq
-    git: git://github.com/TalkingQuickly/monit_configs-tlq.git
-    revision: c10ee522a69db1ec48672a2b1c8a42ae92e027e1
-    branch: master
+    git: https://github.com/TalkingQuickly/monit_configs-tlq.git
+    revision: 2bf25564c623514d2d56c8518f6334d14914073a
+    tag: 1.0.0
   mysql (~> 5.6.3)
-  nginx
-    git: git://github.com/miketheman/nginx.git
-    revision: e36944b0dac1f21044a4f0d01fc566023325cfde
-  ntp (~> 2.0.0)
+  nginx (~> 11.4.0)
+  ntp (~> 3.7.0)
   openssh (= 1.2.2)
-  postgresql (~> 4.0.6)
+  postgresql (~> 8.2.1)
   rails_gem_dependencies-tlq
-    git: git://github.com/TalkingQuickly/rails_gem_dependencies-tlq.git
-    revision: f62ff22492dd9a2c31cd856de176c19f0fbe2d73
-  redis-server
-    git: git://github.com/TalkingQuickly/redis-server.git
-    revision: a8cf2367505d543a0601db572b90ff30d693f202
+    git: https://github.com/TalkingQuickly/rails_gem_dependencies-tlq.git
+    revision: 9592bdf890810ded3752879c6ac1e6111e669304
+    tag: 1.0.0
+  redisio (~> 4.2.0)
+  ruby_build (~> 2.1.1)
   ruby_rbenv
-    git: git://github.com/fnichol/chef-rbenv.git
-    revision: ea66c6f18be9cb54bae70b1280408bb09e47dc53
+    git: https://github.com/sous-chefs/ruby_rbenv.git
+    revision: 35c775e5e0371cb798f5049a56dc8330bd196f15
   sudo (~> 2.9.0)
-  ufw (~> 1.0.0)
-  users
-    git: git://github.com/opscode-cookbooks/users.git
-    revision: 80ca9d184f02557474a1e5fd5c821e834c50e2a0
+  ufw (~> 3.2.1)
+  users (~> 5.5.0)
 
 GRAPH
-  7-zip (1.0.2)
-    windows (>= 1.2.2)
   apt (2.9.2)
   apt-chef (1.0.0)
     apt (>= 0.0.0)
-  bluepill (2.4.3)
-    rsyslog (>= 2.0)
-  build-essential (2.4.0)
-    7-zip (>= 0.0.0)
-  chef-sugar (3.3.0)
-  chef_handler (1.4.0)
-  compat_resource (12.10.6)
+  chef-sugar (5.1.12)
   fail2ban (2.3.0)
     yum-epel (>= 0.0.0)
-  firewall (2.5.2)
+  firewall (2.7.0)
     chef-sugar (>= 0.0.0)
+  homebrew (5.1.0)
   hostnames (0.3.1)
     hostsfile (>= 0.0.0)
   hostsfile (2.4.5)
   iptables (2.2.0)
-  java (1.39.0)
-    apt (>= 0.0.0)
   locale (1.1.0)
-  memcached (3.0.0)
-    compat_resource (>= 12.9.0)
-    runit (>= 1.2.0)
-    yum-epel (>= 0.0.0)
-  monit-tlq (0.3.11)
-  monit_configs-tlq (0.1.2)
+  memcached (6.1.0)
+  monit-tlq (0.5.0)
+  monit_configs-tlq (1.0.0)
   mysql (5.6.3)
     yum-mysql-community (>= 0.0.0)
-  nginx (2.7.6)
-    apt (~> 2.2)
-    bluepill (~> 2.3)
-    build-essential (~> 2.0)
-    ohai (~> 2.0)
-    runit (~> 1.2)
-    yum-epel (~> 0.3)
-  ntp (2.0.0)
-    windows (>= 1.38.0)
-  ohai (2.1.0)
+  nginx (11.4.0)
+    ohai (~> 5.2)
+  ntp (3.7.0)
+  ohai (5.3.0)
   openssh (1.2.2)
     iptables (>= 0.0.0)
-  openssl (4.4.0)
-    chef-sugar (>= 3.1.1)
-  packagecloud (0.2.3)
-  postgresql (4.0.6)
-    apt (>= 1.9.0)
-    build-essential (>= 0.0.0)
-    openssl (~> 4.0)
-  rails_gem_dependencies-tlq (0.0.3)
+  postgresql (8.2.1)
     apt (>= 0.0.0)
-  redis-server (0.1.1)
+    yum-epel (>= 0.0.0)
+  rails_gem_dependencies-tlq (1.0.0)
     apt (>= 0.0.0)
-  rsyslog (4.0.0)
-    compat_resource (>= 0.0.0)
-  ruby_build (0.8.0)
-  ruby_rbenv (1.0.1)
-    java (> 1.4.0)
-    ruby_build (>= 0.0.0)
-  runit (1.7.8)
-    packagecloud (>= 0.0.0)
+  redisio (4.2.0)
+    selinux_policy (>= 2.2.0)
+    ulimit (>= 0.1.2)
+  ruby_build (2.1.1)
+    homebrew (>= 0.0.0)
+    yum-centos (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  ruby_rbenv (2.6.0)
+  selinux_policy (2.4.3)
   sudo (2.9.0)
-  ufw (1.0.0)
+  ufw (3.2.1)
     firewall (>= 2.0)
-  users (2.0.3)
-  windows (1.43.0)
-    chef_handler (>= 0.0.0)
+  ulimit (1.1.1)
+  users (5.5.0)
   yum (3.11.0)
+  yum-centos (4.0.2)
   yum-epel (0.7.0)
     yum (>= 3.6.3)
   yum-mysql-community (0.2.0)

Changelog.md

@@ -1,3 +1,16 @@
+## 5.0.0 (March 2021)
+
+* Updates to support latest Chef Workstation instead of legacy ChefDK
+* Updates for Ubuntu 20.04 (LTS) Compatibility
+* Migrates nginx, postgresql, memcached, redis and rbenv to use wrapper cookbooks around the primary open source cookbooks 
+* Upgrades default Ruby version to 3.0.0
+* Upgrades default Postgres version to 13
+
+## 4.0.0
+
+* Updates for Ubuntu 16.04 Compatibility
+* Moves from Chef Solo to Chef Zero
+
 ## 3.0.0
 
 * Replaces <https://github.com/TalkingQuickly/mongo-tlq> MongoDB cookbook with community cookbook <https://github.com/edelight/chef-mongodb>