Merge branch 'CHEF-985' of git://github.com/tfheen/chef into tfheen/CHEF-985

adamhjk · adamhjk · commit cd6152de2ac7 · 2010-02-26T15:49:59.000-08:00
diff --git a/chef/config/server.rb b/chef/config/server.rb
@@ -8,7 +8,6 @@
 file_store_path File.join(File.dirname(__FILE__), "..", "examples", "store")
 openid_store_path File.join(File.dirname(__FILE__), "..", "examples", "openid-db")
 openid_cstore_path File.join(File.dirname(__FILE__), "..", "examples", "openid-cstore")
-search_index_path File.join(File.dirname(__FILE__), "..", "examples", "search_index")
 
 # openid_providers [ "localhost:4001", "openid.hjksolutions.com" ]
 
diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb
@@ -139,7 +139,6 @@ def self.manage_secret_key
 rest_timeout 60
 run_command_stderr_timeout 120
 run_command_stdout_timeout 120
- search_index_path "/var/chef/search_index"
 search_url "http://localhost:4000"
 solo false
 splay nil
diff --git a/features/data/config/server.rb b/features/data/config/server.rb
@@ -17,7 +17,6 @@
 cookbook_tarball_path File.join(tmpdir, "cookbook-tarballs")
 openid_store_path File.join(tmpdir, "openid", "store")
 openid_cstore_path File.join(tmpdir, "openid", "cstore")
-search_index_path File.join(tmpdir, "search_index")
 role_path File.join(supportdir, "roles")
 signing_ca_path File.join(tmpdir, "ca")
 couchdb_database 'chef_integration'

-Original file line number
+Diff line change
 file_store_pathFile.join(File.dirname(__FILE__),"..","examples","store")
 openid_store_pathFile.join(File.dirname(__FILE__),"..","examples","openid-db")
 openid_cstore_pathFile.join(File.dirname(__FILE__),"..","examples","openid-cstore")
 -search_index_pathFile.join(File.dirname(__FILE__),"..","examples","search_index")
 # openid_providers [ "localhost:4001", "openid.hjksolutions.com" ]
-Original file line number
+Diff line change
 rest_timeout60
 run_command_stderr_timeout120
 run_command_stdout_timeout120
 -search_index_path"/var/chef/search_index"
 search_url"http://localhost:4000"
 solofalse
 splaynil
-Original file line number
+Diff line change
 cookbook_tarball_pathFile.join(tmpdir,"cookbook-tarballs")
 openid_store_pathFile.join(tmpdir,"openid","store")
 openid_cstore_pathFile.join(tmpdir,"openid","cstore")
 -search_index_pathFile.join(tmpdir,"search_index")
 role_pathFile.join(supportdir,"roles")
 signing_ca_pathFile.join(tmpdir,"ca")
 couchdb_database'chef_integration'