diff options
| author | Adam Jacob <adam@opscode.com> | 2009-11-30 14:29:41 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2009-11-30 14:29:41 -0800 |
| commit | f0aeb2f15b8cdfabb7641b594b515251cae11c73 (patch) | |
| tree | 730db26cbf22ab7e6aa478f00ba566a618c67983 /chef-server | |
| parent | 5ba914a7a95cbac857468c1b8dfde01ae35353ad (diff) | |
| download | chef-f0aeb2f15b8cdfabb7641b594b515251cae11c73.tar.gz | |
Fixing the chef-server-api boot block, for good
Diffstat (limited to 'chef-server')
| -rwxr-xr-x | chef-server/bin/chef-server | 2 | ||||
| -rw-r--r-- | chef-server/config.ru | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server index cd4be70a33..035b949d60 100755 --- a/chef-server/bin/chef-server +++ b/chef-server/bin/chef-server @@ -28,7 +28,7 @@ require "merb-core" [ '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") + library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb")) require library if File.exists?(library) end diff --git a/chef-server/config.ru b/chef-server/config.ru index dc4d8d9afb..4c6aa6d86c 100644 --- a/chef-server/config.ru +++ b/chef-server/config.ru @@ -5,7 +5,7 @@ require 'chef' Chef::Config.from_file(File.join("/etc", "chef", "server.rb")) Merb::Config.setup(:merb_root => File.expand_path(File.dirname(__FILE__)), - :environment => ENV['RACK_ENV'], + :environment => 'production', :fork_for_class_load => false, :init_file => File.dirname(__FILE__) / "config/init.rb") Merb.environment = Merb::Config[:environment] |