chef 0.10.4 → 0.10.6.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (125) hide show
  1. data/distro/common/html/chef-client.8.html +9 -4
  2. data/distro/common/html/chef-expander.8.html +4 -4
  3. data/distro/common/html/chef-expanderctl.8.html +4 -4
  4. data/distro/common/html/chef-server-webui.8.html +4 -4
  5. data/distro/common/html/chef-server.8.html +4 -4
  6. data/distro/common/html/chef-solo.8.html +4 -4
  7. data/distro/common/html/chef-solr.8.html +6 -4
  8. data/distro/common/html/knife-bootstrap.1.html +13 -11
  9. data/distro/common/html/knife-client.1.html +4 -4
  10. data/distro/common/html/knife-configure.1.html +4 -4
  11. data/distro/common/html/knife-cookbook-site.1.html +7 -5
  12. data/distro/common/html/knife-cookbook.1.html +10 -8
  13. data/distro/common/html/knife-data-bag.1.html +4 -4
  14. data/distro/common/html/knife-environment.1.html +4 -4
  15. data/distro/common/html/knife-exec.1.html +4 -4
  16. data/distro/common/html/knife-index.1.html +4 -4
  17. data/distro/common/html/knife-node.1.html +5 -26
  18. data/distro/common/html/knife-role.1.html +4 -4
  19. data/distro/common/html/knife-search.1.html +9 -8
  20. data/distro/common/html/knife-ssh.1.html +10 -10
  21. data/distro/common/html/knife-status.1.html +4 -4
  22. data/distro/common/html/knife-tag.1.html +4 -4
  23. data/distro/common/html/knife.1.html +36 -10
  24. data/distro/common/html/shef.1.html +4 -4
  25. data/distro/common/man/man1/knife-bootstrap.1 +18 -10
  26. data/distro/common/man/man1/knife-client.1 +1 -1
  27. data/distro/common/man/man1/knife-configure.1 +1 -1
  28. data/distro/common/man/man1/knife-cookbook-site.1 +10 -2
  29. data/distro/common/man/man1/knife-cookbook.1 +10 -5
  30. data/distro/common/man/man1/knife-data-bag.1 +1 -1
  31. data/distro/common/man/man1/knife-environment.1 +1 -1
  32. data/distro/common/man/man1/knife-exec.1 +1 -1
  33. data/distro/common/man/man1/knife-index.1 +1 -1
  34. data/distro/common/man/man1/knife-node.1 +2 -22
  35. data/distro/common/man/man1/knife-role.1 +1 -1
  36. data/distro/common/man/man1/knife-search.1 +8 -5
  37. data/distro/common/man/man1/knife-ssh.1 +17 -12
  38. data/distro/common/man/man1/knife-status.1 +1 -1
  39. data/distro/common/man/man1/knife-tag.1 +1 -1
  40. data/distro/common/man/man1/knife.1 +50 -9
  41. data/distro/common/man/man1/shef.1 +1 -1
  42. data/distro/common/man/man8/chef-client.8 +21 -1
  43. data/distro/common/man/man8/chef-expander.8 +1 -1
  44. data/distro/common/man/man8/chef-expanderctl.8 +1 -1
  45. data/distro/common/man/man8/chef-server-webui.8 +1 -1
  46. data/distro/common/man/man8/chef-server.8 +1 -1
  47. data/distro/common/man/man8/chef-solo.8 +1 -1
  48. data/distro/common/man/man8/chef-solr.8 +9 -1
  49. data/distro/common/markdown/man1/knife-bootstrap.mkd +9 -5
  50. data/distro/common/markdown/man1/knife-cookbook-site.mkd +5 -1
  51. data/distro/common/markdown/man1/knife-cookbook.mkd +7 -4
  52. data/distro/common/markdown/man1/knife-node.mkd +1 -19
  53. data/distro/common/markdown/man1/knife-search.mkd +5 -4
  54. data/distro/common/markdown/man1/knife-ssh.mkd +8 -0
  55. data/distro/common/markdown/man1/knife.mkd +39 -8
  56. data/distro/common/markdown/man8/chef-client.mkd +10 -0
  57. data/distro/common/markdown/man8/chef-solr.mkd +5 -1
  58. data/distro/debian/etc/init.d/chef-client +48 -38
  59. data/distro/redhat/etc/init.d/chef-client +6 -2
  60. data/lib/chef/checksum.rb +9 -24
  61. data/lib/chef/checksum/storage.rb +18 -0
  62. data/lib/chef/checksum/storage/filesystem.rb +56 -0
  63. data/lib/chef/config.rb +6 -2
  64. data/lib/chef/cookbook/syntax_check.rb +1 -1
  65. data/lib/chef/cookbook_version.rb +37 -9
  66. data/lib/chef/file_access_control.rb +1 -1
  67. data/lib/chef/handler.rb +21 -0
  68. data/lib/chef/knife/bootstrap.rb +3 -1
  69. data/lib/chef/knife/bootstrap/archlinux-gems.erb +10 -0
  70. data/lib/chef/knife/bootstrap/centos5-gems.erb +13 -2
  71. data/lib/chef/knife/bootstrap/fedora13-gems.erb +10 -0
  72. data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +10 -0
  73. data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +10 -0
  74. data/lib/chef/knife/client_create.rb +13 -7
  75. data/lib/chef/knife/client_delete.rb +0 -2
  76. data/lib/chef/knife/client_edit.rb +0 -3
  77. data/lib/chef/knife/client_list.rb +0 -1
  78. data/lib/chef/knife/client_reregister.rb +2 -3
  79. data/lib/chef/knife/client_show.rb +0 -1
  80. data/lib/chef/knife/configure.rb +1 -1
  81. data/lib/chef/knife/configure_client.rb +0 -2
  82. data/lib/chef/knife/cookbook_create.rb +12 -12
  83. data/lib/chef/knife/cookbook_delete.rb +2 -0
  84. data/lib/chef/knife/cookbook_download.rb +9 -6
  85. data/lib/chef/knife/cookbook_list.rb +1 -6
  86. data/lib/chef/knife/cookbook_metadata.rb +8 -8
  87. data/lib/chef/knife/cookbook_site_list.rb +4 -2
  88. data/lib/chef/knife/cookbook_test.rb +1 -1
  89. data/lib/chef/knife/core/bootstrap_context.rb +9 -0
  90. data/lib/chef/knife/core/generic_presenter.rb +8 -1
  91. data/lib/chef/knife/core/node_presenter.rb +30 -0
  92. data/lib/chef/knife/core/ui.rb +8 -3
  93. data/lib/chef/knife/data_bag_create.rb +2 -5
  94. data/lib/chef/knife/data_bag_from_file.rb +2 -6
  95. data/lib/chef/knife/node_show.rb +8 -3
  96. data/lib/chef/knife/role_create.rb +2 -2
  97. data/lib/chef/knife/role_from_file.rb +12 -5
  98. data/lib/chef/knife/search.rb +1 -1
  99. data/lib/chef/knife/ssh.rb +20 -3
  100. data/lib/chef/mixin/command/windows.rb +1 -1
  101. data/lib/chef/platform.rb +24 -0
  102. data/lib/chef/provider/deploy.rb +93 -17
  103. data/lib/chef/provider/file.rb +5 -1
  104. data/lib/chef/provider/group/groupadd.rb +11 -1
  105. data/lib/chef/provider/ifconfig.rb +66 -5
  106. data/lib/chef/provider/package.rb +41 -5
  107. data/lib/chef/provider/package/apt.rb +10 -0
  108. data/lib/chef/provider/package/yum.rb +59 -14
  109. data/lib/chef/provider/remote_directory.rb +0 -1
  110. data/lib/chef/provider/service/debian.rb +2 -2
  111. data/lib/chef/provider/service/invokercd.rb +35 -0
  112. data/lib/chef/provider/service/windows.rb +92 -83
  113. data/lib/chef/resource.rb +4 -1
  114. data/lib/chef/resource/deploy.rb +9 -0
  115. data/lib/chef/resource/group.rb +8 -0
  116. data/lib/chef/resource/ifconfig.rb +12 -2
  117. data/lib/chef/resource/package.rb +1 -1
  118. data/lib/chef/resource/service.rb +1 -10
  119. data/lib/chef/shef/shef_session.rb +2 -1
  120. data/lib/chef/shell_out.rb +0 -1
  121. data/lib/chef/shell_out/windows.rb +508 -52
  122. data/lib/chef/solr_query/solr_http_request.rb +19 -5
  123. data/lib/chef/tasks/chef_repo.rake +9 -5
  124. data/lib/chef/version.rb +1 -1
  125. metadata +414 -453
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "SHEF" "1" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "SHEF" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBshef\fR \- Interactive Chef Console
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-CLIENT" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-CLIENT" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.
@@ -34,6 +34,10 @@ Run chef\-client periodically, in seconds
34
34
  Load attributes from a JSON file or URL
35
35
  .
36
36
  .TP
37
+ \fB\-E\fR, \fB\-\-environment ENVIRONMENT\fR
38
+ Set the Chef Environment on the node
39
+ .
40
+ .TP
37
41
  \fB\-l\fR, \fB\-\-log_level LEVEL\fR
38
42
  Set the log level (debug, info, warn, error, fatal)
39
43
  .
@@ -50,6 +54,14 @@ Ensures logging goes to STDOUT as well as to other configured log location(s)\.
50
54
  The node name for this client
51
55
  .
52
56
  .TP
57
+ \fB\-K\fR, \fB\-\-validation_key KEY_FILE\fR
58
+ Set the validation key file location, used for registering new clients
59
+ .
60
+ .TP
61
+ \fB\-k\fR, \fB\-\-client_key KEY_FILE\fR
62
+ Set the client key file location
63
+ .
64
+ .TP
53
65
  \fB\-s\fR, \fB\-\-splay SECONDS\fR
54
66
  The splay time for running at intervals, in seconds
55
67
  .
@@ -58,6 +70,14 @@ The splay time for running at intervals, in seconds
58
70
  User to set privilege to
59
71
  .
60
72
  .TP
73
+ \fB\-P\fR, \fB\-\-pid PIDFILE\fR
74
+ Set the PID file location, defaults to /tmp/chef\-client\.pid
75
+ .
76
+ .TP
77
+ \fB\-\-once\fR
78
+ Cancel any interval or splay options, run chef once and exit
79
+ .
80
+ .TP
61
81
  \fB\-v\fR, \fB\-\-version\fR
62
82
  Show chef version
63
83
  .
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-EXPANDER" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-EXPANDER" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-EXPANDERCTL" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-EXPANDERCTL" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-expanderctl\fR \- management program for chef\-expander
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SERVER\-WEBUI" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-SERVER\-WEBUI" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SERVER" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-SERVER" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-server\fR \- Start the Chef Server merb application slice\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SOLO" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-SOLO" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SOLR" "8" "August 2011" "Chef 0.10.4" "Chef Manual"
4
+ .TH "CHEF\-SOLR" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-solr\fR \- Runs as Chef\'s search server
@@ -30,6 +30,10 @@ Set the log level (debug, info, warn, error, fatal)
30
30
  Set the log file location, defaults to STDOUT \- recommended for daemonizing
31
31
  .
32
32
  .TP
33
+ \fB\-P\fR, \fB\-\-pid PIDFILE\fR
34
+ Set the PID file location, defaults to /tmp/chef\-solr\.pid
35
+ .
36
+ .TP
33
37
  \fB\-D\fR, \fB\-\-solr\-data\-dir PATH\fR
34
38
  Where the Solr data lives
35
39
  .
@@ -46,6 +50,10 @@ Solr home directory
46
50
  Raw options passed to Java
47
51
  .
48
52
  .TP
53
+ \fB\-x\fR, \fB\-\-solor\-heap\-size\fR
54
+ Set the size of the Java Heap
55
+ .
56
+ .TP
49
57
  \fB\-W\fR, \fB\-\-solr\-jetty\-dir PATH\fR
50
58
  Where to place the Solr Jetty instance
51
59
  .
@@ -1,4 +1,4 @@
1
- knife-bootrap(1) -- Install Chef Client on a remote host
1
+ knife-bootstrap(1) -- Install Chef Client on a remote host
2
2
  ========================================
3
3
 
4
4
  ## SYNOPSIS
@@ -13,20 +13,24 @@ __knife__ __bootstrap__ _(options)_
13
13
  The ssh password
14
14
  * `-x`, `--ssh-user USERNAME`:
15
15
  The ssh username
16
+ * `-p`, `--ssh-port PORT`:
17
+ The ssh port
18
+ * `--bootstrap-version VERSION`:
19
+ The version of Chef to install
20
+ * `--bootstrap-proxy PROXY_URL`:
21
+ `The proxy server for the node being bootstrapped`
16
22
  * `--prerelease`:
17
23
  Install pre-release Chef gems
18
24
  * `-r`, `--run-list RUN_LIST`:
19
25
  Comma separated list of roles/recipes to apply
20
- * `-P`, `--ssh-password PASSWORD`:
21
- The ssh password
22
- * `-x`, `--ssh-user USERNAME`:
23
- The ssh username
24
26
  * `--template-file TEMPLATE`:
25
27
  Full path to location of template to use
26
28
  * `--sudo`:
27
29
  Execute the bootstrap via sudo
28
30
  * `-d`, `--distro DISTRO`:
29
31
  Bootstrap a distro using a template
32
+ * `--no-host-key-verify`:
33
+ Disable host key verification
30
34
 
31
35
  ## DESCRIPTION
32
36
 
@@ -13,6 +13,10 @@ __cookbook site install COOKBOOK [VERSION]__ _(options)_
13
13
 
14
14
  * `-D`, `--no-dependencies `:
15
15
  Do not install dependencies automatically
16
+ * `-o`, `--cookbook-path PATH`:
17
+ Install cookbooks to PATH
18
+ * `-B`, `--branch BRANCH`:
19
+ Default branch to work with [defaults to master]
16
20
 
17
21
  Uses git(1) version control in conjunction with the cookbook site to
18
22
  install community contributed cookbooks to your local cookbook
@@ -26,7 +30,7 @@ repository. Running `knife cookbook site install` does the following:
26
30
  5. The pristine copy branch is merged into the master branch.
27
31
 
28
32
  By installing cookbook with this process, you can locally modify the
29
- upstream cookbook in your master branch ant let git maintain your
33
+ upstream cookbook in your master branch and let git maintain your
30
34
  changes as a separate patch. When an updated upstream version becomes
31
35
  available, you will be able to merge the upstream changes while
32
36
  maintaining your local modifications.
@@ -27,6 +27,8 @@ __knife cookbook show cookbook [version] [part] [filename]__ _(options)_
27
27
  the platform to see the file for
28
28
  * `-v`, `--platform-version version`:
29
29
  the platform version to see the file for
30
+ * `-w`, `--with-uri`:
31
+ Show corresponding URIs
30
32
 
31
33
  show a particular part of a _cookbook_ for the specified _version_. _part_ can be one of:
32
34
 
@@ -114,7 +116,7 @@ __knife cookbook create cookbook__ _(options)_
114
116
  * `-o`, `--cookbook-path path`:
115
117
  the directory where the cookbook will be created
116
118
  * `-r`, `--readme-format format`:
117
- format of the readme file
119
+ format of the readme file md, mkd, txt, rdoc
118
120
  * `-c`, `--copyright copyright`:
119
121
  name of copyright holder
120
122
  * `-i`, `--license license`:
@@ -132,12 +134,12 @@ named cookbook.
132
134
  * cookbook/libraries
133
135
  * cookbook/metadata.rb
134
136
  * cookbook/providers
135
- * cookbook/readme.rdoc
137
+ * cookbook/readme.md
136
138
  * cookbook/recipes/default.rb
137
139
  * cookbook/resources
138
140
  * cookbook/templates/default
139
141
 
140
- supported readme formats are 'rdoc' (default), 'md', 'mkd', 'txt'. the
142
+ supported readme formats are 'md' (default), 'mkd', 'txt', 'rdoc'. the
141
143
  readme file will be written with the specified extension and a set of
142
144
  helpful starting headers.
143
145
 
@@ -158,12 +160,13 @@ specify `-e` or `--email` with the email address of the cookbook's
158
160
  maintainer. if this value is not specified, an all-caps string
159
161
  `your_email` is used which can easily be changed with find/replace.
160
162
 
161
- the cookbook copyright, license and email settings can be filled in the
163
+ the cookbook copyright, license, email and readme_format settings can be filled in the
162
164
  `knife.rb`, for example with default values:
163
165
 
164
166
  cookbook_copyright "your_company_name"
165
167
  cookbook_license "none"
166
168
  cookbook_email "your_email"
169
+ readme_format "md"
167
170
 
168
171
 
169
172
  ## METADATA
@@ -100,25 +100,7 @@ __knife node show__ _node name_ _(options)_
100
100
  Display more, but not all, of the node's data when using the default
101
101
  _summary_ format
102
102
 
103
- Displays the node identified by _node name_ on stdout. The amount of
104
- content displayed and the output format are modified by the --format
105
- option. If no alternate format is selected, the default is summary.
106
- Valid formats are:
107
-
108
- * summary:
109
- displays the node in a custom, summarized format (default)
110
- * text
111
- displays the node data in its entirety using the colorized tree
112
- display
113
- * json:
114
- displays the node in JSON format
115
- * yaml:
116
- displays the node in YAML format
117
- * pp
118
- displays the node using Ruby's pretty printer.
119
-
120
- For brevity, only the first character of the format is required, for
121
- example, -Fj will produce JSON format output.
103
+ Displays the node identified by _node name_ on stdout.
122
104
 
123
105
  ## RUN LIST ITEM FORMAT
124
106
  Run list items may be either roles or recipes. When adding a role to a
@@ -44,6 +44,7 @@ query syntax. The following data types are indexed for search:
44
44
  * _node_
45
45
  * _role_
46
46
  * _environment_
47
+ * _clients_
47
48
  * _data bag_
48
49
 
49
50
  Data bags are indexed by the data bag's name. For example, to search a
@@ -108,7 +109,7 @@ Fuzzy searches allows one to match values based on the Levenshtein
108
109
  Distance algorithm. To perform a fuzzy match, append a tilda (~) to
109
110
  the search term:
110
111
 
111
- knife search nodes 'field:term~'
112
+ knife search INDEX 'field:term~'
112
113
 
113
114
  This search would return nodes whose `field` was 'perm' or 'germ'.
114
115
 
@@ -146,15 +147,15 @@ The following characters must be escaped:
146
147
  Find the nodes with the fully-qualified domain name (FQDN)
147
148
  www.example.com:
148
149
 
149
- knife search nodes 'fqdn:www.example.com'
150
+ knife search node 'fqdn:www.example.com'
150
151
 
151
152
  Find the nodes running a version of Ubuntu:
152
153
 
153
- knife search nodes 'platform:ubuntu*'
154
+ knife search node 'platform:ubuntu*'
154
155
 
155
156
  Find all nodes running CentOS in the production environment:
156
157
 
157
- knife search nodes 'chef_environment:production AND platform:centos'
158
+ knife search node 'chef_environment:production AND platform:centos'
158
159
 
159
160
  ## KNOWN BUGS
160
161
 
@@ -17,6 +17,13 @@ __knife__ __ssh QUERY COMMAND__ _(options)_
17
17
  The ssh username
18
18
  * `-i`, `--identity-file IDENTITY_FILE`:
19
19
  The SSH identity file used for authentication
20
+ * `-p`, `--ssh-port PORT`:
21
+ The ssh port
22
+ * `-i`, `--identity-file IDENTITY_FILE`:
23
+ The SSH identity file used for authentication
24
+ * `--no-host-key-verify`:
25
+ Disable host key verification
26
+
20
27
 
21
28
  ## DESCRIPTION
22
29
 
@@ -35,6 +42,7 @@ multiple interactive ssh sessions running locally in the terminal
35
42
  multiplexer instead of invoking the command on the remote host.
36
43
 
37
44
  The available multiplexers are:
45
+
38
46
  * `interactive`:
39
47
  A built-in multiplexer. `interactive` supports running commands on a
40
48
  subset of the connected hosts in parallel
@@ -40,14 +40,14 @@ documentation using `knife help TOPIC`.
40
40
  API Client Key, corresponds to `Chef::Config` `client_key`.
41
41
  * `-c`, `--config` CONFIG:
42
42
  The configuration file to use
43
+ * `-E`, `--environment ENVIRONMENT`:
44
+ Set the Chef environment
43
45
  * `-e`, `--editor` EDITOR:
44
46
  Set the editor to use for interactive commands
45
47
  * `-F`, `--format` FORMAT:
46
- Which format to use for output
47
- * `-l`, `--log_level` LEVEL:
48
- Set the log level (debug, info, warn, error, fatal), corresponds to `Chef::Config` `log_level`.
49
- * `-L`, `--logfile` LOGLOCATION:
50
- Set the log file location, defaults to STDOUT, corresponds to `Chef::Config` `log_location`.
48
+ Which format to use for output. See FORMATS for details.
49
+ * `-V`, `--verbose`:
50
+ More verbose output. Use twice for max verbosity
51
51
  * `-n`, `--no-editor`:
52
52
  Do not open EDITOR, just accept the data as is
53
53
  * `-u`, `--user` USER:
@@ -58,6 +58,12 @@ documentation using `knife help TOPIC`.
58
58
  Show chef version
59
59
  * `-y`, `--yes`:
60
60
  Say yes to all prompts for confirmation
61
+ * `--defaults`:
62
+ Accept default values for all questions
63
+ * `--color`:
64
+ Use colored output
65
+ * `--no-color`:
66
+ Don't use colors in the output
61
67
  * `-h`, `--help`:
62
68
  Show the available options for a command.
63
69
 
@@ -108,9 +114,9 @@ If the config file exists, knife uses these settings for __GENERAL OPTIONS__ def
108
114
  Specifies the private key file to use when bootstrapping new hosts.
109
115
  See knife-client(1) for more information about the validation
110
116
  client.
111
- * `cookbook_copyright`, `cookbook_email`, `cookbook_license`
117
+ * `cookbook_copyright`, `cookbook_email`, `cookbook_license`, `readme_format`
112
118
  Used by `knife cookbook create` sub-command to specify the copyright
113
- holder, maintainer email and license (respectively) for new cookbooks.
119
+ holder, maintainer email, license and readme format (respectively) for new cookbooks.
114
120
  The copyright holder is listed as the maintainer in the cookbook's
115
121
  metadata and as the Copyright in the comments of the default recipe. The
116
122
  maintainer email is used in the cookbook metadata. The license
@@ -118,7 +124,9 @@ If the config file exists, knife uses these settings for __GENERAL OPTIONS__ def
118
124
  and is listed as the license in the cookbook metadata. Currently
119
125
  supported licenses are "apachev2" and "none". Any other values will
120
126
  result in an empty license in the metadata (needs to be filled in by the
121
- author), and no comment preamble in the default recipe.
127
+ author), and no comment preamble in the default recipe. Currently supported
128
+ readme formats are "md", "mkd", "txt", and "rdoc". Any other value will
129
+ result in an unformatted README.
122
130
 
123
131
  ## FILES
124
132
 
@@ -126,6 +134,28 @@ _~/.chef/knife.rb_
126
134
 
127
135
  Ruby DSL configuration file for knife. See __CONFIGURATION__.
128
136
 
137
+ ## FORMATS
138
+
139
+ The amount of content displayed and the output format are
140
+ modified by the `--format` option. If no alternate format is selected,
141
+ the default is summary.
142
+
143
+ Valid formats are:
144
+
145
+ * `summary`:
146
+ displays the node in a custom, summarized format (default)
147
+ * `text`:
148
+ displays the node data in its entirety using the colorized tree display
149
+ * `json`:
150
+ displays the node in JSON format
151
+ * `yaml`:
152
+ displays the node in YAML format
153
+ * `pp`:
154
+ displays the node using Ruby's pretty printer.
155
+
156
+ For brevity, only the first character of the format is required, for
157
+ example, -Fj will produce JSON format output.
158
+
129
159
  ## CHEF WORKFLOW
130
160
 
131
161
  When working with Chef and Knife in the local repository, the recommended workflow outline looks like:
@@ -144,6 +174,7 @@ but it is not required, except in the case of the `cookbook site vendor`
144
174
  sub-command, as it uses git directly. Version control is strongly
145
175
  recommended though, and git fits with a lot of the workflow paradigms.
146
176
 
177
+
147
178
  ## EXAMPLES
148
179
 
149
180
 
@@ -17,6 +17,8 @@ __chef-client__ _(options)_
17
17
  Run chef-client periodically, in seconds
18
18
  * `-j`, `--json-attributes JSON_ATTRIBS`:
19
19
  Load attributes from a JSON file or URL
20
+ * `-E`, `--environment ENVIRONMENT`:
21
+ Set the Chef Environment on the node
20
22
  * `-l`, `--log_level LEVEL`:
21
23
  Set the log level (debug, info, warn, error, fatal)
22
24
  * `-L`, `--logfile LOGLOCATION`:
@@ -27,10 +29,18 @@ __chef-client__ _(options)_
27
29
  log location(s).
28
30
  * `-N`, `--node-name NODE_NAME`:
29
31
  The node name for this client
32
+ * `-K`, `--validation_key KEY_FILE`:
33
+ Set the validation key file location, used for registering new clients
34
+ * `-k`, `--client_key KEY_FILE`:
35
+ Set the client key file location
30
36
  * `-s`, `--splay SECONDS`:
31
37
  The splay time for running at intervals, in seconds
32
38
  * `-u`, `--user USER`:
33
39
  User to set privilege to
40
+ * `-P`, `--pid PIDFILE`:
41
+ Set the PID file location, defaults to /tmp/chef-client.pid
42
+ * `--once`:
43
+ Cancel any interval or splay options, run chef once and exit
34
44
  * `-v`, `--version`:
35
45
  Show chef version
36
46
  * `-h`, `--help`:
@@ -15,6 +15,8 @@ __chef-solr__ _(options)_
15
15
  Set the log level (debug, info, warn, error, fatal)
16
16
  * `-L`, `--logfile LOGLOCATION`:
17
17
  Set the log file location, defaults to STDOUT - recommended for daemonizing
18
+ * `-P`, `--pid PIDFILE`:
19
+ Set the PID file location, defaults to /tmp/chef-solr.pid
18
20
  * `-D`, `--solr-data-dir PATH`:
19
21
  Where the Solr data lives
20
22
  * `-x`, `--solor-heap-size SIZE`:
@@ -23,6 +25,8 @@ __chef-solr__ _(options)_
23
25
  Solr home directory
24
26
  * `-j`, `--java-opts OPTS`:
25
27
  Raw options passed to Java
28
+ * `-x`, `--solor-heap-size`:
29
+ Set the size of the Java Heap
26
30
  * `-W`, `--solr-jetty-dir PATH`:
27
31
  Where to place the Solr Jetty instance
28
32
  * `-u`, `--user USER`:
@@ -82,4 +86,4 @@ help2man. Permission is granted to copy, distribute and / or modify
82
86
  this document under the terms of the Apache 2.0 License.
83
87
 
84
88
  On Debian systems, the complete text of the Apache 2.0 License can be
85
- found in /usr/share/common-licenses/Apache-2.0.
89
+ found in /usr/share/common-licenses/Apache-2.0.