Updating config file paths

2 files changed, 16 insertions, 1 deletions

diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index 4eb72e1856..e440e3a940 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -122,6 +122,13 @@ class Chef
     def []=(attrib, value)
       @attribute[attrib] = value
     end
+  
+    # Yield each key to the block
+    def each(&block)
+      @attribute.each_key do |k|
+        yield(k)
+      end
+    end
     
     # Iterates over each attribute, passing the attribute and value to the block.
     def each_attribute(&block)
diff --git a/lib/chef_server/init.rb b/lib/chef_server/init.rb
index 2e4e58bb97..991a6f5c8b 100644
--- a/lib/chef_server/init.rb
+++ b/lib/chef_server/init.rb
@@ -82,7 +82,15 @@ Merb.disable :json
 # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
 Merb::BootLoader.after_app_loads do
   # Add dependencies here that must load after the application loads:
-  Chef::Config.from_file(File.join(File.dirname(__FILE__), "..", "..", "config", "chef-server.rb"))
+  if File.exist?(File.dirname(__FILE__), "..", "..", "config", "server.rb")    
+    Chef::Config.from_file(
+      File.join(File.dirname(__FILE__), "..", "..", "config", "server.rb")
+    )
+  else
+    Chef::Config.from_file(
+      File.join("etc", "config", "server.rb")
+    )
+  end
   Chef::Queue.connect
 
   # create the couch design docs for nodes and openid registrations