Skip to content

Commit

Permalink
Config files should be examples only, canonical versions of Chef conf…
Browse files Browse the repository at this point in the history
…iguration in opscode/cookbook for Chef
  • Loading branch information
jtimberman committed Jun 4, 2009
1 parent 3402852 commit defe666
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 30 deletions.
13 changes: 0 additions & 13 deletions config/client.rb

This file was deleted.

22 changes: 22 additions & 0 deletions config/client.rb.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# Example Chef Client Config File
#
# We recommend using Opscode's chef cookbook for managing chef itself,
# instead of using this file.

log_level :info
log_location STDOUT
ssl_verify_mode :verify_none
registration_url "https://chef.localdomain"
openid_url "https://chef.localdomain"
template_url "https://chef.localdomain"
remotefile_url "https://chef.localdomain"
search_url "https://chef.localdomain"
role_url "https://chef.localdomain"

file_store_path "/srv/chef/file_store"
file_cache_path "/srv/chef/cache"

pid_file "/var/run/chef/chef-client.pid"

Chef::Log::Formatter.show_time = true
16 changes: 0 additions & 16 deletions config/server.rb

This file was deleted.

33 changes: 33 additions & 0 deletions config/server.rb.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# Example Chef Server Config File
#
# We recommend using Opscode's chef cookbook for managing chef itself,
# instead of using this file.

log_level :info
log_location "/var/log/chef/server.log"
ssl_verify_mode :verify_none
registration_url "https://localhost"
openid_url "https://localhost"
template_url "https://localhost"
remotefile_url "https://localhost"
search_url "https://localhost"
role_url "https://localhost"

#validation_token "change_this_token"

cookbook_path [ "/srv/chef/site-cookbooks", "/srv/chef/cookbooks" ]

file_store_path "/srv/chef/file_store"
file_cache_path "/srv/chef/cache"
node_path "/srv/chef/nodes"
openid_store_path "/srv/chef/openid/store"
openid_cstore_path "/srv/chef/openid/cstore"
search_index_path "/srv/chef/search_index"

# uncomment and modify to allow specific openid providers
#openid_providers [ "https://localhost", "https://chef" ]
# uncomment and modify to lock down openid identifiers, ie 'some_user.myopenid.com'
#authorized_openid_identifiers [ "" ]

Chef::Log::Formatter.show_time = true
2 changes: 1 addition & 1 deletion config/solo.rb → config/solo.rb.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

log_level :info
log_location STDOUT
file_cache_path "/var/chef/cookbooks"
file_cache_path "/srv/chef/cookbooks"
ssl_verify_mode :verify_none
Chef::Log::Formatter.show_time = false

0 comments on commit defe666

Please sign in to comment.