Skip to content

Commit 5458958

Browse files
committed
How about you do use mongrel by default
1 parent d40773b commit 5458958

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

chef-server/bin/chef-server

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222

2323
require "rubygems"
2424
require "merb-core"
25-
require 'chef'
25+
require "chef"
2626

2727
if ARGV[0] && ARGV[0] =~ /^[^-]/
2828
ARGV.push "-H"
2929
end
30-
30+
unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
31+
ARGV.push *%w[-a mongrel]
32+
end
3133
ARGV.push *[ "-I", File.join(File.dirname(__FILE__), "..", "lib", "init.rb") ]
3234

3335
if index = ARGV.index("-C")
@@ -41,4 +43,6 @@ else
4143
)
4244
end
4345

46+
Chef::Config.from_file(File.join("/etc/", "chef", "server.rb"))
47+
4448
Merb.start

0 commit comments

Comments
 (0)