adapt to new init.rb location

remove node_path and merb_log_path

Author: Christopher Brown

chef-server/bin/chef-server

@@ -30,7 +30,7 @@ end
 unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
   ARGV.push *%w[-a mongrel]
 end
-ARGV.push *[ "-I", File.join(File.dirname(__FILE__), "..", "lib", "init.rb") ]
+ARGV.push *[ "-I", File.join(File.dirname(__FILE__), "..", "config", "init.rb") ]
 
 if index = ARGV.index("-C")
   config = ARGV[index+1]

example-repository/config/server.rb

@@ -16,10 +16,8 @@
 remotefile_url     "http://127.0.0.1:4000"
 search_url         "http://127.0.0.1:4000"
 cookbook_path      [ "/var/chef/site-cookbooks", "/var/chef/cookbooks" ]
-node_path          "/var/chef/nodes"
 openid_store_path  "/var/chef/openid/store"
 openid_cstore_path "/var/chef/openid/cstore"
-merb_log_path      "/var/log/chef-server.log"
 search_index_path  "/var/chef/search_index"
 
 Chef::Log::Formatter.show_time = false