Skip to content

Commit 363604d

Browse files
Merge pull request #51 from TalkingQuickly/feature/upgrade_to_chef_zero
Feature/upgrade to chef zero
2 parents e562f13 + fad543b commit 363604d

27 files changed

Lines changed: 16591 additions & 413 deletions
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
38295
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Generated at 2016-06-13 14:30:37 +0100
2+
Net::HTTPFatalError: 500 "Internal Server Error"
3+
/Users/ben/.rbenv/versions/2.1.1/lib/ruby/2.1.0/net/http/response.rb:119:in `error!'
4+
/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'
5+
/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'
6+
/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'
7+
/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'
8+
/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'
9+
/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'
10+
/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'
11+
/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'
12+
/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'
13+
/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'
14+
/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'
15+
/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'
16+
/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'
17+
/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'
18+
/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'
19+
/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'
20+
/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'
21+
/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'
22+
/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'
23+
/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'
24+
/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)>'
25+
/Users/ben/.rbenv/versions/2.1.1/bin/chef-client:23:in `load'
26+
/Users/ben/.rbenv/versions/2.1.1/bin/chef-client:23:in `<main>'

Berksfile

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,46 @@
11
source "https://api.berkshelf.com"
22

3-
cookbook 'apt', github: 'opscode-cookbooks/apt'
4-
cookbook 'chef-solo-search', github: 'edelight/chef-solo-search'
5-
cookbook 'build-essential', github: 'opscode-cookbooks/build-essential'
6-
cookbook 'fail2ban', github: 'opscode-cookbooks/fail2ban'
7-
cookbook 'hostnames', github: 'nathantsoi/chef-cookbook-hostname'
8-
cookbook 'locales', github: 'phbergsmann/chef-locales'
9-
cookbook 'look_and_feel-tlq', github: 'TalkingQuickly/look_and_feel-tlq'
10-
cookbook 'memcached', github: 'opscode-cookbooks/memcached'
11-
cookbook 'mongodb', github: 'edelight/chef-mongodb'
12-
cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master'
13-
cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'
14-
cookbook 'mysql', github: 'opscode-cookbooks/mysql'
3+
# cookbook 'apt', github: 'opscode-cookbooks/apt'
4+
cookbook 'apt-chef', '~> 1.0.0'
5+
6+
#cookbook 'build-essential', github: 'opscode-cookbooks/build-essential'
7+
cookbook 'build-essential'
8+
9+
# cookbook 'fail2ban', github: 'opscode-cookbooks/fail2ban'
10+
cookbook 'fail2ban', '~> 2.3.0'
11+
12+
# cookbook 'hostnames', github: 'nathantsoi/chef-cookbook-hostname'
13+
cookbook 'hostnames', '= 0.3.1'
14+
15+
cookbook 'locale', '~> 1.1.0'
16+
17+
#cookbook 'memcached', github: 'opscode-cookbooks/memcached'
18+
cookbook 'memcached', '~> 3.0.0'
19+
20+
#cookbook 'mysql', github: 'opscode-cookbooks/mysql'
21+
cookbook 'mysql', '~> 5.6.3'
22+
23+
#cookbook 'ntp', github: 'gmiranda23/ntp'
24+
cookbook 'ntp', '~> 2.0.0'
25+
26+
#cookbook 'openssh', github: 'opscode-cookbooks/openssh'
27+
cookbook 'openssh', '= 1.2.2'
28+
29+
cookbook 'postgresql', '~> 4.0.6'
30+
31+
# cookbook 'sudo', github: 'opscode-cookbooks/sudo'
32+
cookbook 'sudo', '~> 2.9.0'
33+
34+
# cookbook 'ufw', github: 'opscode-cookbooks/ufw'
35+
cookbook 'ufw', '~> 1.0.0'
36+
cookbook 'firewall', '~> 2.5.2'
37+
1538
cookbook 'nginx', github: 'miketheman/nginx'
16-
cookbook 'ntp', github: 'gmiranda23/ntp'
17-
cookbook 'openssh', github: 'opscode-cookbooks/openssh'
18-
cookbook 'postgresql', github: 'opscode-cookbooks/postgresql'
39+
40+
cookbook 'users', '~> 2.0.3'
41+
1942
cookbook 'rails_gem_dependencies-tlq', github: 'TalkingQuickly/rails_gem_dependencies-tlq'
20-
cookbook 'rbenv', github: 'fnichol/chef-rbenv'
43+
cookbook 'ruby_rbenv', github: 'fnichol/chef-rbenv'
2144
cookbook 'redis-server', github: 'TalkingQuickly/redis-server'
22-
cookbook 'sudo', github: 'opscode-cookbooks/sudo'
23-
cookbook 'ufw', github: 'opscode-cookbooks/ufw'
24-
cookbook 'users', github: 'opscode-cookbooks/users'
45+
cookbook 'monit-tlq', github: 'TalkingQuickly/monit-tlq', branch: 'master'
46+
cookbook 'monit_configs-tlq', github: 'TalkingQuickly/monit_configs-tlq', branch: 'master'

Berksfile.lock

Lines changed: 70 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,11 @@
11
DEPENDENCIES
2-
apt
3-
git: git://github.com/opscode-cookbooks/apt.git
4-
revision: a22d25ba5862d463b08ebbf52f163a90f9878704
2+
apt-chef (~> 1.0.0)
53
build-essential
6-
git: git://github.com/opscode-cookbooks/build-essential.git
7-
revision: 400968913bfa8a4a5c9783b383c3b63899f2fe72
8-
chef-solo-search
9-
git: git://github.com/edelight/chef-solo-search.git
10-
revision: 848fad1461c78fd502975f1df2e14eed12610635
11-
fail2ban
12-
git: git://github.com/opscode-cookbooks/fail2ban.git
13-
revision: 98a8d73afb8ba4ee8b3e7fa30676c8dc6a890fc4
14-
hostnames
15-
git: git://github.com/nathantsoi/chef-cookbook-hostname.git
16-
revision: cfe2b24bd1223087d4655f1bea99a337b31b9843
17-
locales
18-
git: git://github.com/phbergsmann/chef-locales.git
19-
revision: 5ad79628e627a66edf028fe55fa7c92d26687cf0
20-
look_and_feel-tlq
21-
git: git://github.com/TalkingQuickly/look_and_feel-tlq.git
22-
revision: 214b18d5266909721e85fe3acac4f7c926a0c609
23-
memcached
24-
git: git://github.com/opscode-cookbooks/memcached.git
25-
revision: 8ba85664be26833441732e149453142ce5769dfe
26-
mongodb
27-
git: git@github.com:edelight/chef-mongodb.git
28-
revision: 72ffcb114df6c453b59717eb390b2819d48025bd
4+
fail2ban (~> 2.3.0)
5+
firewall (~> 2.5.2)
6+
hostnames (= 0.3.1)
7+
locale (~> 1.1.0)
8+
memcached (~> 3.0.0)
299
monit-tlq
3010
git: git://github.com/TalkingQuickly/monit-tlq.git
3111
revision: 28bbdc06702a00c5cb5ace1fd7f79a51a127ed0c
@@ -34,111 +14,99 @@ DEPENDENCIES
3414
git: git://github.com/TalkingQuickly/monit_configs-tlq.git
3515
revision: c10ee522a69db1ec48672a2b1c8a42ae92e027e1
3616
branch: master
37-
mysql
38-
git: git://github.com/opscode-cookbooks/mysql.git
39-
revision: abf418550a534cee433ded5f85a85f3296a9709e
17+
mysql (~> 5.6.3)
4018
nginx
4119
git: git://github.com/miketheman/nginx.git
42-
revision: e128a0ad7322b0d406857aac5efc7a1c1cb824cd
43-
ntp
44-
git: git://github.com/gmiranda23/ntp.git
45-
revision: 95bec55b5b895c370e63aef2c5aef2d2ca6abc89
46-
openssh
47-
git: git://github.com/opscode-cookbooks/openssh.git
48-
revision: 2548e378898a87fbd5d2f3efeb5b503543b63fa4
49-
postgresql
50-
git: git://github.com/opscode-cookbooks/postgresql.git
51-
revision: bfd310f37dd39d3f8b522e896e17360c2fd66ab7
20+
revision: e36944b0dac1f21044a4f0d01fc566023325cfde
21+
ntp (~> 2.0.0)
22+
openssh (= 1.2.2)
23+
postgresql (~> 4.0.6)
5224
rails_gem_dependencies-tlq
5325
git: git://github.com/TalkingQuickly/rails_gem_dependencies-tlq.git
5426
revision: f62ff22492dd9a2c31cd856de176c19f0fbe2d73
55-
rbenv
56-
git: git://github.com/fnichol/chef-rbenv.git
57-
revision: 0a3018634bafe58ad21c6ee271af015220e444b9
5827
redis-server
5928
git: git://github.com/TalkingQuickly/redis-server.git
60-
revision: 4298f8fe012c1501382dbf2fc9edb737bbf12483
61-
sudo
62-
git: git://github.com/opscode-cookbooks/sudo.git
63-
revision: 8bbdff7302f7a86e18d1a3f029813c665b53b322
64-
ufw
65-
git: git://github.com/opscode-cookbooks/ufw.git
66-
revision: 895fba816ca54456c9c66d008ebbce744f7dec59
29+
revision: a8cf2367505d543a0601db572b90ff30d693f202
30+
ruby_rbenv
31+
git: git://github.com/fnichol/chef-rbenv.git
32+
revision: ea66c6f18be9cb54bae70b1280408bb09e47dc53
33+
sudo (~> 2.9.0)
34+
ufw (~> 1.0.0)
6735
users
6836
git: git://github.com/opscode-cookbooks/users.git
69-
revision: fca9a42ab44dadbb98432c931dfc6c049ecc23ce
37+
revision: 80ca9d184f02557474a1e5fd5c821e834c50e2a0
7038

7139
GRAPH
72-
apt (2.6.0)
73-
bluepill (2.3.1)
74-
rsyslog (>= 0.0.0)
75-
build-essential (2.0.5)
76-
chef-solo-search (0.5.1)
77-
chef-sugar (2.3.0)
78-
fail2ban (2.2.1)
79-
yum (~> 3.0)
40+
7-zip (1.0.2)
41+
windows (>= 1.2.2)
42+
apt (2.9.2)
43+
apt-chef (1.0.0)
44+
apt (>= 0.0.0)
45+
bluepill (2.4.3)
46+
rsyslog (>= 2.0)
47+
build-essential (2.4.0)
48+
7-zip (>= 0.0.0)
49+
chef-sugar (3.3.0)
50+
chef_handler (1.4.0)
51+
compat_resource (12.10.6)
52+
fail2ban (2.3.0)
8053
yum-epel (>= 0.0.0)
81-
firewall (0.11.8)
82-
hostnames (0.3.5)
54+
firewall (2.5.2)
55+
chef-sugar (>= 0.0.0)
56+
hostnames (0.3.1)
8357
hostsfile (>= 0.0.0)
8458
hostsfile (2.4.5)
85-
iptables (0.14.0)
86-
java (1.22.0)
87-
locales (0.3.1)
88-
look_and_feel-tlq (0.0.5)
89-
locales (>= 0.0.0)
90-
memcached (1.7.3)
91-
runit (~> 1.0)
92-
yum (~> 3.0)
59+
iptables (2.2.0)
60+
java (1.39.0)
61+
apt (>= 0.0.0)
62+
locale (1.1.0)
63+
memcached (3.0.0)
64+
compat_resource (>= 12.9.0)
65+
runit (>= 1.2.0)
9366
yum-epel (>= 0.0.0)
94-
mongodb (0.16.1)
95-
apt (>= 1.8.2)
96-
python (>= 0.0.0)
97-
runit (>= 1.5.0)
98-
yum (>= 3.0.0)
9967
monit-tlq (0.3.11)
10068
monit_configs-tlq (0.1.2)
101-
mysql (5.3.6)
69+
mysql (5.6.3)
10270
yum-mysql-community (>= 0.0.0)
103-
nginx (2.7.4)
71+
nginx (2.7.6)
10472
apt (~> 2.2)
10573
bluepill (~> 2.3)
10674
build-essential (~> 2.0)
10775
ohai (~> 2.0)
10876
runit (~> 1.2)
10977
yum-epel (~> 0.3)
110-
ntp (1.8.6)
111-
ohai (2.0.1)
112-
openssh (1.3.5)
78+
ntp (2.0.0)
79+
windows (>= 1.38.0)
80+
ohai (2.1.0)
81+
openssh (1.2.2)
11382
iptables (>= 0.0.0)
114-
openssl (2.0.0)
115-
chef-sugar (>= 0.0.0)
116-
postgresql (3.4.4)
83+
openssl (4.4.0)
84+
chef-sugar (>= 3.1.1)
85+
packagecloud (0.2.3)
86+
postgresql (4.0.6)
11787
apt (>= 1.9.0)
11888
build-essential (>= 0.0.0)
119-
openssl (>= 0.0.0)
120-
python (1.4.6)
121-
build-essential (>= 0.0.0)
122-
yum-epel (>= 0.0.0)
89+
openssl (~> 4.0)
12390
rails_gem_dependencies-tlq (0.0.3)
12491
apt (>= 0.0.0)
125-
rbenv (0.7.3)
126-
java (> 1.4.0)
127-
ruby_build (>= 0.0.0)
12892
redis-server (0.1.1)
12993
apt (>= 0.0.0)
130-
rsyslog (1.12.2)
94+
rsyslog (4.0.0)
95+
compat_resource (>= 0.0.0)
13196
ruby_build (0.8.0)
132-
runit (1.5.10)
133-
build-essential (>= 0.0.0)
134-
yum (~> 3.0)
135-
yum-epel (>= 0.0.0)
136-
sudo (2.6.1)
137-
ufw (0.7.5)
138-
firewall (>= 0.9.0)
139-
users (1.7.1)
140-
yum (3.2.2)
141-
yum-epel (0.5.1)
142-
yum (~> 3.0)
143-
yum-mysql-community (0.1.8)
144-
yum (>= 3.0.0)
97+
ruby_rbenv (1.0.1)
98+
java (> 1.4.0)
99+
ruby_build (>= 0.0.0)
100+
runit (1.7.8)
101+
packagecloud (>= 0.0.0)
102+
sudo (2.9.0)
103+
ufw (1.0.0)
104+
firewall (>= 2.0)
105+
users (2.0.3)
106+
windows (1.43.0)
107+
chef_handler (>= 0.0.0)
108+
yum (3.11.0)
109+
yum-epel (0.7.0)
110+
yum (>= 3.6.3)
111+
yum-mysql-community (0.2.0)
112+
yum (>= 3.2)

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'knife-solo', '0.4.2'
4-
gem 'chef', '~> 11.16.0'
5-
gem 'chef-zero', '2.2'
6-
gem 'berkshelf', '~> 3.1.5'
3+
gem 'chef', '~> 12.11.8'
4+
gem 'chef-zero', '4.6.2'
5+
gem 'berkshelf', '~> 4.3.3'
6+
gem 'knife-zero', '~> 1.7', '>= 1.7.1'

0 commit comments

Comments
 (0)