diff options
Diffstat (limited to 'chef-server/bin/chef-server')
| -rwxr-xr-x | chef-server/bin/chef-server | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server index 70595c07ad..cd4be70a33 100755 --- a/chef-server/bin/chef-server +++ b/chef-server/bin/chef-server @@ -26,7 +26,8 @@ require "rubygems" require "merb-core" -[ 'chef', 'chef-server-slice' ].each do |lib| +[ 'chef', 'chef-server-api' ].each do |lib| + $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))) library = File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb") require library if File.exists?(library) end @@ -50,7 +51,7 @@ if ARGV[0] && ARGV[0] =~ /^[^-]/ ARGV.push "-H" end unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) } - ARGV.push *%w[-a mongrel] + ARGV.push *%w[-a thin] end ARGV.push *[ "-I", File.join(__DIR__, "config", "init.rb") ] ARGV.push *[ "-m", __DIR__] |