Skip to content

Commit

Permalink
Merge pull request #51 from TalkingQuickly/feature/upgrade_to_chef_zero
Browse files Browse the repository at this point in the history
Feature/upgrade to chef zero
  • Loading branch information
TalkingQuickly authored Jan 15, 2017
2 parents e562f13 + fad543b commit 363604d
Show file tree
Hide file tree
Showing 27 changed files with 16,591 additions and 413 deletions.
1 change: 1 addition & 0 deletions .chef/local-mode-cache/cache/chef-client-running.pid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
38295
26 changes: 26 additions & 0 deletions .chef/local-mode-cache/cache/chef-stacktrace.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Generated at 2016-06-13 14:30:37 +0100
Net::HTTPFatalError: 500 "Internal Server Error"
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/2.1.0/net/http/response.rb:119:in `error!'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/http.rb:146:in `request'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/http.rb:127:in `post'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/node.rb:639:in `create'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/node.rb:592:in `rescue in find_or_create'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/node.rb:588:in `find_or_create'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/policy_builder/dynamic.rb:72:in `load_node'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/client.rb:467:in `load_node'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/client.rb:269:in `run'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application.rb:286:in `block in fork_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application.rb:274:in `fork'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application.rb:274:in `fork_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application.rb:239:in `block in run_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/local_mode.rb:44:in `with_server_connectivity'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application.rb:227:in `run_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application/client.rb:456:in `sleep_then_run_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application/client.rb:443:in `block in interval_run_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application/client.rb:442:in `loop'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application/client.rb:442:in `interval_run_chef_client'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application/client.rb:426:in `run_application'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/lib/chef/application.rb:59:in `run'
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/gems/2.1.0/gems/chef-12.11.18/bin/chef-client:26:in `<top (required)>'
/Users/ben/.rbenv/versions/2.1.1/bin/chef-client:23:in `load'
/Users/ben/.rbenv/versions/2.1.1/bin/chef-client:23:in `<main>'
60 changes: 41 additions & 19 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,46 @@
source "https://api.berkshelf.com"

cookbook 'apt', github: 'opscode-cookbooks/apt'
cookbook 'chef-solo-search', github: 'edelight/chef-solo-search'
cookbook 'build-essential', github: 'opscode-cookbooks/build-essential'
cookbook 'fail2ban', github: 'opscode-cookbooks/fail2ban'
cookbook 'hostnames', github: 'nathantsoi/chef-cookbook-hostname'
cookbook 'locales', github: 'phbergsmann/chef-locales'
cookbook 'look_and_feel-tlq', github: 'TalkingQuickly/look_and_feel-tlq'
cookbook 'memcached', github: 'opscode-cookbooks/memcached'
cookbook 'mongodb', github: 'edelight/chef-mongodb'
cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master'
cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'
cookbook 'mysql', github: 'opscode-cookbooks/mysql'
# 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'

# cookbook 'hostnames', github: 'nathantsoi/chef-cookbook-hostname'
cookbook 'hostnames', '= 0.3.1'

cookbook 'locale', '~> 1.1.0'

#cookbook 'memcached', github: 'opscode-cookbooks/memcached'
cookbook 'memcached', '~> 3.0.0'

#cookbook 'mysql', github: 'opscode-cookbooks/mysql'
cookbook 'mysql', '~> 5.6.3'

#cookbook 'ntp', github: 'gmiranda23/ntp'
cookbook 'ntp', '~> 2.0.0'

#cookbook 'openssh', github: 'opscode-cookbooks/openssh'
cookbook 'openssh', '= 1.2.2'

cookbook 'postgresql', '~> 4.0.6'

# 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 'nginx', github: 'miketheman/nginx'
cookbook 'ntp', github: 'gmiranda23/ntp'
cookbook 'openssh', github: 'opscode-cookbooks/openssh'
cookbook 'postgresql', github: 'opscode-cookbooks/postgresql'

cookbook 'users', '~> 2.0.3'

cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq'
cookbook 'rbenv', github: 'fnichol/chef-rbenv'
cookbook 'ruby_rbenv', github: 'fnichol/chef-rbenv'
cookbook 'redis-server', github: 'TalkingQuickly/redis-server'
cookbook 'sudo', github: 'opscode-cookbooks/sudo'
cookbook 'ufw', github: 'opscode-cookbooks/ufw'
cookbook 'users', github: 'opscode-cookbooks/users'
cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master'
cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'
172 changes: 70 additions & 102 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,11 @@
DEPENDENCIES
apt
git: git://github.com/opscode-cookbooks/apt.git
revision: a22d25ba5862d463b08ebbf52f163a90f9878704
apt-chef (~> 1.0.0)
build-essential
git: git://github.com/opscode-cookbooks/build-essential.git
revision: 400968913bfa8a4a5c9783b383c3b63899f2fe72
chef-solo-search
git: git://github.com/edelight/chef-solo-search.git
revision: 848fad1461c78fd502975f1df2e14eed12610635
fail2ban
git: git://github.com/opscode-cookbooks/fail2ban.git
revision: 98a8d73afb8ba4ee8b3e7fa30676c8dc6a890fc4
hostnames
git: git://github.com/nathantsoi/chef-cookbook-hostname.git
revision: cfe2b24bd1223087d4655f1bea99a337b31b9843
locales
git: git://github.com/phbergsmann/chef-locales.git
revision: 5ad79628e627a66edf028fe55fa7c92d26687cf0
look_and_feel-tlq
git: git://github.com/TalkingQuickly/look_and_feel-tlq.git
revision: 214b18d5266909721e85fe3acac4f7c926a0c609
memcached
git: git://github.com/opscode-cookbooks/memcached.git
revision: 8ba85664be26833441732e149453142ce5769dfe
mongodb
git: [email protected]:edelight/chef-mongodb.git
revision: 72ffcb114df6c453b59717eb390b2819d48025bd
fail2ban (~> 2.3.0)
firewall (~> 2.5.2)
hostnames (= 0.3.1)
locale (~> 1.1.0)
memcached (~> 3.0.0)
monit-tlq
git: git://github.com/TalkingQuickly/monit-tlq.git
revision: 28bbdc06702a00c5cb5ace1fd7f79a51a127ed0c
Expand All @@ -34,111 +14,99 @@ DEPENDENCIES
git: git://github.com/TalkingQuickly/monit_configs-tlq.git
revision: c10ee522a69db1ec48672a2b1c8a42ae92e027e1
branch: master
mysql
git: git://github.com/opscode-cookbooks/mysql.git
revision: abf418550a534cee433ded5f85a85f3296a9709e
mysql (~> 5.6.3)
nginx
git: git://github.com/miketheman/nginx.git
revision: e128a0ad7322b0d406857aac5efc7a1c1cb824cd
ntp
git: git://github.com/gmiranda23/ntp.git
revision: 95bec55b5b895c370e63aef2c5aef2d2ca6abc89
openssh
git: git://github.com/opscode-cookbooks/openssh.git
revision: 2548e378898a87fbd5d2f3efeb5b503543b63fa4
postgresql
git: git://github.com/opscode-cookbooks/postgresql.git
revision: bfd310f37dd39d3f8b522e896e17360c2fd66ab7
revision: e36944b0dac1f21044a4f0d01fc566023325cfde
ntp (~> 2.0.0)
openssh (= 1.2.2)
postgresql (~> 4.0.6)
rails_gem_dependencies-tlq
git: git://github.com/TalkingQuickly/rails_gem_dependencies-tlq.git
revision: f62ff22492dd9a2c31cd856de176c19f0fbe2d73
rbenv
git: git://github.com/fnichol/chef-rbenv.git
revision: 0a3018634bafe58ad21c6ee271af015220e444b9
redis-server
git: git://github.com/TalkingQuickly/redis-server.git
revision: 4298f8fe012c1501382dbf2fc9edb737bbf12483
sudo
git: git://github.com/opscode-cookbooks/sudo.git
revision: 8bbdff7302f7a86e18d1a3f029813c665b53b322
ufw
git: git://github.com/opscode-cookbooks/ufw.git
revision: 895fba816ca54456c9c66d008ebbce744f7dec59
revision: a8cf2367505d543a0601db572b90ff30d693f202
ruby_rbenv
git: git://github.com/fnichol/chef-rbenv.git
revision: ea66c6f18be9cb54bae70b1280408bb09e47dc53
sudo (~> 2.9.0)
ufw (~> 1.0.0)
users
git: git://github.com/opscode-cookbooks/users.git
revision: fca9a42ab44dadbb98432c931dfc6c049ecc23ce
revision: 80ca9d184f02557474a1e5fd5c821e834c50e2a0

GRAPH
apt (2.6.0)
bluepill (2.3.1)
rsyslog (>= 0.0.0)
build-essential (2.0.5)
chef-solo-search (0.5.1)
chef-sugar (2.3.0)
fail2ban (2.2.1)
yum (~> 3.0)
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)
fail2ban (2.3.0)
yum-epel (>= 0.0.0)
firewall (0.11.8)
hostnames (0.3.5)
firewall (2.5.2)
chef-sugar (>= 0.0.0)
hostnames (0.3.1)
hostsfile (>= 0.0.0)
hostsfile (2.4.5)
iptables (0.14.0)
java (1.22.0)
locales (0.3.1)
look_and_feel-tlq (0.0.5)
locales (>= 0.0.0)
memcached (1.7.3)
runit (~> 1.0)
yum (~> 3.0)
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)
mongodb (0.16.1)
apt (>= 1.8.2)
python (>= 0.0.0)
runit (>= 1.5.0)
yum (>= 3.0.0)
monit-tlq (0.3.11)
monit_configs-tlq (0.1.2)
mysql (5.3.6)
mysql (5.6.3)
yum-mysql-community (>= 0.0.0)
nginx (2.7.4)
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 (1.8.6)
ohai (2.0.1)
openssh (1.3.5)
ntp (2.0.0)
windows (>= 1.38.0)
ohai (2.1.0)
openssh (1.2.2)
iptables (>= 0.0.0)
openssl (2.0.0)
chef-sugar (>= 0.0.0)
postgresql (3.4.4)
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 (>= 0.0.0)
python (1.4.6)
build-essential (>= 0.0.0)
yum-epel (>= 0.0.0)
openssl (~> 4.0)
rails_gem_dependencies-tlq (0.0.3)
apt (>= 0.0.0)
rbenv (0.7.3)
java (> 1.4.0)
ruby_build (>= 0.0.0)
redis-server (0.1.1)
apt (>= 0.0.0)
rsyslog (1.12.2)
rsyslog (4.0.0)
compat_resource (>= 0.0.0)
ruby_build (0.8.0)
runit (1.5.10)
build-essential (>= 0.0.0)
yum (~> 3.0)
yum-epel (>= 0.0.0)
sudo (2.6.1)
ufw (0.7.5)
firewall (>= 0.9.0)
users (1.7.1)
yum (3.2.2)
yum-epel (0.5.1)
yum (~> 3.0)
yum-mysql-community (0.1.8)
yum (>= 3.0.0)
ruby_rbenv (1.0.1)
java (> 1.4.0)
ruby_build (>= 0.0.0)
runit (1.7.8)
packagecloud (>= 0.0.0)
sudo (2.9.0)
ufw (1.0.0)
firewall (>= 2.0)
users (2.0.3)
windows (1.43.0)
chef_handler (>= 0.0.0)
yum (3.11.0)
yum-epel (0.7.0)
yum (>= 3.6.3)
yum-mysql-community (0.2.0)
yum (>= 3.2)
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'knife-solo', '0.4.2'
gem 'chef', '~> 11.16.0'
gem 'chef-zero', '2.2'
gem 'berkshelf', '~> 3.1.5'
gem 'chef', '~> 12.11.8'
gem 'chef-zero', '4.6.2'
gem 'berkshelf', '~> 4.3.3'
gem 'knife-zero', '~> 1.7', '>= 1.7.1'
Loading

0 comments on commit 363604d

Please sign in to comment.