Merge branch 'master' into feature/ubuntu-16.04

Batali

@@ -10,33 +10,30 @@ Batali.define do
            git: 'https://github.com/67P/wordpress-cookbook.git',
            ref: 'relax_dependencies'
   cookbook 'postfix'
-  cookbook 'unattended-upgrades'
-  cookbook 'application_nodejs',
-           git: 'https://github.com/67p/application_nodejs.git',
-           ref: 'master'
   cookbook 'php-fpm',     '0.7.8'
-  cookbook 'application', '4.1.6'
   cookbook 'php',         '~> 3.0.0'
-  cookbook 'users'
-  cookbook 'sudo'
+  cookbook 'poise-ruby-build',      '~> 1.1.0'
+  cookbook 'application',           '~> 5.2.0'
+  cookbook 'application_javascript'
+  cookbook 'application_ruby',      '~> 4.1.0'
+  cookbook 'application_git',       '~> 1.1.0' # 1.2.0 doesn't work with knife-solo
+  cookbook 'users',                 '~> 5.0.0'
+  cookbook 'sudo',                  '~> 3.5.0'
   cookbook 'hostname'
   cookbook 'redis',
            git: 'https://github.com/phlipper/chef-redis.git',
            ref: 'v0.5.6'
-  cookbook 'ufw'
-  cookbook 'firewall'
-  cookbook 'nginx'
+  cookbook 'firewall',              '~> 2.6.1'
+  cookbook 'chef_nginx',            '~> 6.0.2'
   cookbook 'build-essential'
-  cookbook 'mysql',           '~> 8.3.0'
+  cookbook 'mysql'
+  cookbook 'postgresql',      '~> 6.1'
   cookbook 'database'
-  cookbook 'mysql2_chef_gem', '~> 2.0.1'
-  cookbook 'omnibus_updater'
+  cookbook 'mysql2_chef_gem'
+  cookbook 'chef_client_updater',   '~> 1.0.2'
   cookbook 'timezone-ii'
   cookbook 'nodejs',          '~> 3.0.0'
-  cookbook 'ark'
-  cookbook 'logrotate'
-
-  # Unused
-  cookbook "yum-epel",        '0.3.6'
+  cookbook 'ark',             '~> 3.0.0'
+  cookbook 'logrotate',       '~> 2.1.0'
+  cookbook 'openssl',         '~> 7.0.1'
 end
-