Skip to content

Commit e34ca5b

Browse files
adamhjkadamhjk
committed
Merge branch 'CHEF-555' of git://github.com/skeptomai/chef into skeptomai/CHEF-555
2 parents 7832cf2 + 600cbfb commit e34ca5b

6 files changed

Lines changed: 34 additions & 43 deletions

File tree

‎chef-server-api/README.rdoc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ chef:
1919
* stomp
2020
* ohai
2121

22-
chef-server and the chefserverslice (merb slice), same requires as chef above, plus:
22+
chef-server and the chef-server-api (merb slice), same requires as chef above, plus:
2323

24-
* stompserver
25-
* ferret
2624
* merb-core
2725
* merb-haml
28-
* mongrel
26+
* thin
2927
* haml
3028
* ruby-openid
3129
* syntax

‎chef-server-api/Rakefile‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,14 @@ spec = Gem::Specification.new do |s|
2525
s.homepage = HOMEPAGE
2626

2727
["merb-slices",
28-
"stomp",
29-
"stompserver",
30-
"merb-core",
31-
"merb-assets",
32-
"merb-helpers",
33-
"mongrel",
34-
"haml",
35-
"ruby-openid",
36-
"json",
37-
"uuidtools",
38-
"nanite"
28+
"merb-core",
29+
"merb-assets",
30+
"merb-helpers",
31+
"thin",
32+
"haml",
33+
"json",
34+
"uuidtools",
35+
"nanite"
3936
].each { |g| s.add_dependency g}
4037

4138
s.require_path = 'lib'

‎chef-server-webui/Rakefile‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ spec = Gem::Specification.new do |s|
2525
s.homepage = HOMEPAGE
2626

2727
["merb-slices",
28-
"stomp",
29-
"stompserver",
30-
"ferret",
31-
"merb-core",
32-
"merb-haml",
33-
"merb-assets",
34-
"merb-helpers",
35-
"mongrel",
36-
"haml",
37-
"ruby-openid",
38-
"json",
39-
"syntax",].each { |g| s.add_dependency g}
28+
"merb-core",
29+
"merb-haml",
30+
"merb-assets",
31+
"merb-helpers",
32+
"thin",
33+
"haml",
34+
"json",
35+
"syntax",].each { |g| s.add_dependency g}
4036

4137
s.require_path = 'lib'
4238
s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{config,lib,spec,app,public,stubs}/**/*")

‎chef-server/chef-server.gemspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
2626
s.add_runtime_dependency(%q<ferret>, [">= 0"])
2727
s.add_runtime_dependency(%q<merb-core>, [">= 0"])
2828
s.add_runtime_dependency(%q<merb-haml>, [">= 0"])
29-
s.add_runtime_dependency(%q<mongrel>, [">= 0"])
29+
s.add_runtime_dependency(%q<thin>, [">= 0"])
3030
s.add_runtime_dependency(%q<haml>, [">= 0"])
3131
s.add_runtime_dependency(%q<ruby-openid>, [">= 0"])
3232
s.add_runtime_dependency(%q<json>, [">= 0"])
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
3737
s.add_dependency(%q<ferret>, [">= 0"])
3838
s.add_dependency(%q<merb-core>, [">= 0"])
3939
s.add_dependency(%q<merb-haml>, [">= 0"])
40-
s.add_dependency(%q<mongrel>, [">= 0"])
40+
s.add_dependency(%q<thin>, [">= 0"])
4141
s.add_dependency(%q<haml>, [">= 0"])
4242
s.add_dependency(%q<ruby-openid>, [">= 0"])
4343
s.add_dependency(%q<json>, [">= 0"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
4949
s.add_dependency(%q<ferret>, [">= 0"])
5050
s.add_dependency(%q<merb-core>, [">= 0"])
5151
s.add_dependency(%q<merb-haml>, [">= 0"])
52-
s.add_dependency(%q<mongrel>, [">= 0"])
52+
s.add_dependency(%q<thin>, [">= 0"])
5353
s.add_dependency(%q<haml>, [">= 0"])
5454
s.add_dependency(%q<ruby-openid>, [">= 0"])
5555
s.add_dependency(%q<json>, [">= 0"])

‎chef-server/lib/tasks/package.rake‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ spec = Gem::Specification.new do |s|
1313
s.email = EMAIL
1414
s.homepage = HOMEPAGE
1515

16-
%w{stomp stompserver ferret
17-
merb-core merb-haml merb-assets
18-
merb-helpers mongrel haml
16+
%w{ merb-core merb-haml merb-assets
17+
merb-helpers thin haml
1918
ruby-openid json coderay}.each { |gem| s.add_dependency gem }
2019

2120
s.bindir = "bin"

‎chef/README.rdoc‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Install the following RubyGems.
4646
* webrat
4747
* merb-core
4848
* roman-merb_cucumber
49+
* thin
4950

5051
Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master.
5152

@@ -61,25 +62,25 @@ Once everything is installed, run the dev:features rake task. Since the features
6162

6263
The dev:features task:
6364

64-
* Installs chef, chef-server, chef-server-slice gems. It will fail if required gems above are missing.
65-
* Starts chef-server on ports 4000 and 4001.
66-
* Starts chef-indexer.
6765
* Starts CouchDB on port 5984.
68-
* Starts the stompserver on port 61613.
66+
* Starts rabbitmq
67+
* Starts solr
68+
* Starts chef-indexer.
69+
* Starts chef-server on port 4000
70+
6971

7072
You'll know its running when you see:
7173

72-
~ Activating slice 'ChefServerSlice' ...
73-
merb : worker (port 4000) ~ Starting Mongrel at port 4000
74-
merb : worker (port 4000) ~ Successfully bound to port 4000
75-
merb : worker (port 4001) ~ Starting Mongrel at port 4001
76-
merb : worker (port 4001) ~ Successfully bound to port 4001
74+
~ Activating slice 'ChefServerApi' ...
75+
merb : worker (port 4000) ~ Starting Thin at port 4000
76+
merb : worker (port 4000) ~ Using Thin adapter on host 0.0.0.0 and port 4000.
77+
merb : worker (port 4000) ~ Successfully bound to port 4000
7778

7879
You'll want to leave this terminal running the dev environment.
7980

8081
== Web Interface:
8182

82-
With the dev environment running, you can now access the web interface via http://localhost:4000/. Supply an OpenID to log in.
83+
With the dev environment running, you can now access the web interface via http://localhost:4000/.
8384

8485
== Spec testing:
8586

0 commit comments

Comments
 (0)