Skip to content
Browse files

made some changes in the readme, mainly some wording, but most import…

…antly cut out instructions that gave user option not to use git
  • Loading branch information...
1 parent a45fd42 commit 4354e5e466b38556115bdc629312441aae44f82d @sya sya committed
Showing with 11 additions and 31 deletions.
  1. +9 −29 cookbooks/README.md
  2. +1 −1 notes
  3. +1 −1 vendor/ironfan-pantry
View
38 cookbooks/README.md
@@ -1,54 +1,34 @@
This directory contains the cookbooks used to configure systems in your infrastructure with Chef.
-Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly.
+Knife needs to be configured with the `cookbook_path` setting to know where the cookbooks are located. If this is not set, then several cookbook operations will fail to work properly.
cookbook_path ["./cookbooks"]
-This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used:
+This setting tells Knife to look for the cookbooks directory in the present working directory. This means the Knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used:
current_dir = File.dirname(__FILE__)
cookbook_path ["#{current_dir}/../cookbooks"]
Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`).
-Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`.
+Configure Knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`.
cookbook_copyright "Example, Com."
cookbook_email "cookbooks@example.com"
cookbook_license "apachev2"
-Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
+Supported values for `cookbook_license` are "apachev2", "mit", "gplv2", "gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
Create new cookbooks in this directory with Knife.
knife cookbook create COOKBOOK
-This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe.
+This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb, and default recipe.
-You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is.
+You can also download cookbooks directly from the [Opscode Cookbook Site](http://community.opscode.com/cookbooks) . The following subcommands can help with this.
-The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife.
-
- knife cookbook site install COOKBOOK
-
-This will:
-
-* Download the cookbook tarball from cookbooks.opscode.com.
-* Ensure its on the git master branch.
-* Checks for an existing vendor branch, and creates if it doesn't.
-* Checks out the vendor branch (chef-vendor-COOKBOOK).
-* Removes the existing (old) version.
-* Untars the cookbook tarball it downloaded in the first step.
-* Adds the cookbook files to the git index and commits.
-* Creates a tag for the version downloaded.
-* Checks out the master branch again.
-* Merges the cookbook into master.
-* Repeats the above for all the cookbooks dependencies, downloading them from the community site
-
-The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates.
-
-If you're not using Git, use the site download subcommand to download the tarball.
+Use the site download subcommand to download the tarball.
knife cookbook site download COOKBOOK
-
-This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
+
+This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
2 notes
@@ -1 +1 @@
-Subproject commit ec061bcff82c34010183ddcd86669d406b224ff1
+Subproject commit f5a30b864180dd77302c9d1bb9c06fb17a17f9bf
2 vendor/ironfan-pantry
@@ -1 +1 @@
-Subproject commit 921bfb597dc68ee5c1a21efd342f2d371f8ea757
+Subproject commit aa7ef2b3305741d75a438ea6f231019365c3b3c2

0 comments on commit 4354e5e

Please sign in to comment.
Something went wrong with that request. Please try again.