Skip to content

Commit

Permalink
README and example updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jtimberman committed May 19, 2010
1 parent 709a15e commit cba37d7
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 20 deletions.
4 changes: 3 additions & 1 deletion certificates/README
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
This directory contains certificates created by the Rakefile.
Creating SSL certificates is a common task done in web application
infrastructures, so a rake task is provided to generate certificates.
These certificates are stored here by the ssl_cert task.
2 changes: 1 addition & 1 deletion config/client.rb.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Example Chef Client Config File
#
# We recommend using Opscode's chef cookbook for managing chef itself,
# Use Opscode's chef cookbook for managing chef itself,
# instead of using this file. It is provided as an example.

log_level :info
Expand Down
2 changes: 2 additions & 0 deletions config/knife.rb.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file provided as an example. Run 'knife configure' to generate a
# config file for your local user.
log_level :info
log_location STDOUT
node_name 'chef_admin'
Expand Down
2 changes: 1 addition & 1 deletion config/server.rb.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Chef Server Config File
#
# We recommend using Opscode's chef cookbook for managing chef itself,
# Use Opscode's chef cookbook for managing chef itself,
# instead of using this file. It is provided as an example.

log_level :info
Expand Down
4 changes: 0 additions & 4 deletions cookbooks/README

This file was deleted.

17 changes: 15 additions & 2 deletions roles/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
Create roles here, in either .rb or .json files. To install roles on the
server, use knife. We provide an example role here.
server, use knife. For example, create roles/base_example.rb:

knife role from file roles/base_example.rb
name "base_example"
description "Example base role applied to all nodes."
# List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'.
#run_list()

# Attributes applied if the node doesn't have it set already.
#default_attributes()

# Attributes applied no matter what the node has set already.
#override_attributes()

Then upload it to the Chef Server:

knife role from file roles/base_example.rb
10 changes: 0 additions & 10 deletions roles/base_example.rb

This file was deleted.

2 changes: 1 addition & 1 deletion site-cookbooks/README
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This directory contains cookbooks that modify upstream ones,
This directory contains cookbooks that modify upstream ones in cookbooks/,
or that are specific to your site.

0 comments on commit cba37d7

Please sign in to comment.