Moving chef/search and chef/search_index to the chef-server gem, where it belongs

Author: adamhjk

chef-server/Rakefile

@@ -5,7 +5,7 @@ GEM = "chef-server"
 CHEF_SERVER_VERSION = "0.0.1"
 AUTHOR = "Adam Jacob"
 EMAIL = "adam@opscode.com"
-HOMEPAGE = "http://hjksolutions.com"
+HOMEPAGE = "http://www.opscode.com/chef"
 SUMMARY = "A configuration management system server."
 
 spec = Gem::Specification.new do |s|
@@ -32,7 +32,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "syntax"
 
   s.bindir       = "bin"
-  s.executables  = %w( chef-indexer chef-server  )
+  s.executables  = %w( chef-indexer chef-server )
 
   s.files = %w(LICENSE README.txt Rakefile) + Dir.glob("{lib}/**/*")
 end

chef/lib/chef/search.rb chef-server/lib/chef/search.rbchef/lib/chef/search.rb renamed to chef-server/lib/chef/search.rb

@@ -24,6 +24,7 @@ require 'chef'
 require 'chef/client'
 require 'json'
 require 'daemons'
+require 'tmpdir'
 
 config = {
   :config_file => "/etc/chef/client.rb",
@@ -95,8 +96,6 @@ config[:daemonize] ||= Chef::Config[:daemonize]
 Chef::Config[:interval] = config[:interval] if config[:interval]
 Chef::Config[:splay]    = config[:splay]    if config[:splay]
 
-Daemons.daemonize(:ontop => !config[:daemonize])
-
 Kernel.trap("INT") { Chef::Log.fatal("Recieved SIGINT - exiting!"); exit 2 }
 
 sleepy_time = 0