Skip to content

Commit e8b5391

Browse files
author
jtimberman
committed
chef-342, add chef server config to config.ru, and we can remove same from chef cookbook.
1 parent 8d17a20 commit e8b5391

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎chef-server/config.ru‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'rubygems'
22
require 'merb-core'
3-
3+
require 'chef'
4+
5+
Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
6+
47
Merb::Config.setup(:merb_root => File.expand_path(File.dirname(__FILE__)),
58
:environment => ENV['RACK_ENV'], :init_file => File.dirname(__FILE__) / "config/init.rb")
69
Merb.environment = Merb::Config[:environment]

0 commit comments

Comments
 (0)