chef 11.10.0.alpha.1 → 11.10.0.rc.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (131) hide show
  1. data/README.md +57 -36
  2. data/distro/common/html/chef-client.8.html +4 -4
  3. data/distro/common/html/chef-expander.8.html +4 -4
  4. data/distro/common/html/chef-expanderctl.8.html +4 -4
  5. data/distro/common/html/chef-server-webui.8.html +4 -4
  6. data/distro/common/html/chef-server.8.html +4 -4
  7. data/distro/common/html/chef-shell.1.html +4 -4
  8. data/distro/common/html/chef-solo.8.html +4 -4
  9. data/distro/common/html/chef-solr.8.html +5 -5
  10. data/distro/common/html/knife-bootstrap.1.html +4 -4
  11. data/distro/common/html/knife-client.1.html +4 -4
  12. data/distro/common/html/knife-configure.1.html +4 -4
  13. data/distro/common/html/knife-cookbook-site.1.html +4 -4
  14. data/distro/common/html/knife-cookbook.1.html +4 -4
  15. data/distro/common/html/knife-data-bag.1.html +4 -4
  16. data/distro/common/html/knife-environment.1.html +4 -4
  17. data/distro/common/html/knife-exec.1.html +4 -4
  18. data/distro/common/html/knife-index.1.html +4 -4
  19. data/distro/common/html/knife-node.1.html +4 -4
  20. data/distro/common/html/knife-role.1.html +4 -4
  21. data/distro/common/html/knife-search.1.html +4 -4
  22. data/distro/common/html/knife-ssh.1.html +4 -4
  23. data/distro/common/html/knife-status.1.html +4 -4
  24. data/distro/common/html/knife-tag.1.html +4 -4
  25. data/distro/common/html/knife.1.html +4 -4
  26. data/distro/common/man/man1/knife-bootstrap.1 +58 -64
  27. data/distro/common/man/man1/knife-client.1 +19 -22
  28. data/distro/common/man/man1/knife-configure.1 +37 -46
  29. data/distro/common/man/man1/knife-cookbook-site.1 +14 -17
  30. data/distro/common/man/man1/knife-cookbook.1 +15 -18
  31. data/distro/common/man/man1/knife-data-bag.1 +14 -17
  32. data/distro/common/man/man1/knife-delete.1 +38 -47
  33. data/distro/common/man/man1/knife-deps.1 +39 -48
  34. data/distro/common/man/man1/knife-diff.1 +43 -52
  35. data/distro/common/man/man1/knife-download.1 +47 -53
  36. data/distro/common/man/man1/knife-edit.1 +32 -41
  37. data/distro/common/man/man1/knife-environment.1 +14 -17
  38. data/distro/common/man/man1/knife-exec.1 +52 -61
  39. data/distro/common/man/man1/knife-index-rebuild.1 +1 -61
  40. data/distro/common/man/man1/knife-list.1 +47 -59
  41. data/distro/common/man/man1/knife-node.1 +15 -18
  42. data/distro/common/man/man1/knife-raw.1 +28 -46
  43. data/distro/common/man/man1/knife-recipe-list.1 +1 -61
  44. data/distro/common/man/man1/knife-role.1 +19 -25
  45. data/distro/common/man/man1/knife-search.1 +53 -62
  46. data/distro/common/man/man1/knife-show.1 +36 -28
  47. data/distro/common/man/man1/knife-ssh.1 +55 -61
  48. data/distro/common/man/man1/knife-status.1 +34 -43
  49. data/distro/common/man/man1/knife-tag.1 +14 -17
  50. data/distro/common/man/man1/knife-upload.1 +47 -56
  51. data/distro/common/man/man1/knife-user.1 +17 -20
  52. data/distro/common/man/man1/knife-xargs.1 +60 -69
  53. data/lib/chef/application.rb +3 -1
  54. data/lib/chef/application/windows_service.rb +0 -1
  55. data/lib/chef/client.rb +41 -152
  56. data/lib/chef/config.rb +19 -23
  57. data/lib/chef/data_bag.rb +1 -1
  58. data/lib/chef/data_bag_item.rb +1 -1
  59. data/lib/chef/exceptions.rb +8 -0
  60. data/lib/chef/formatters/doc.rb +15 -0
  61. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +2 -1
  62. data/lib/chef/http.rb +18 -8
  63. data/lib/chef/http/authenticator.rb +4 -0
  64. data/lib/chef/http/cookie_manager.rb +3 -0
  65. data/lib/chef/http/decompressor.rb +4 -0
  66. data/lib/chef/http/json_input.rb +4 -0
  67. data/lib/chef/http/json_output.rb +4 -0
  68. data/lib/chef/http/validate_content_length.rb +94 -0
  69. data/lib/chef/knife.rb +0 -1
  70. data/lib/chef/knife/configure.rb +6 -6
  71. data/lib/chef/knife/cookbook_create.rb +2 -2
  72. data/lib/chef/knife/core/subcommand_loader.rb +49 -3
  73. data/lib/chef/knife/ssh.rb +34 -4
  74. data/lib/chef/mixin/path_sanity.rb +1 -0
  75. data/lib/chef/monologger.rb +1 -2
  76. data/lib/chef/node.rb +7 -0
  77. data/lib/chef/policy_builder.rb +49 -0
  78. data/lib/chef/policy_builder/expand_node_object.rb +230 -0
  79. data/lib/chef/policy_builder/policyfile.rb +338 -0
  80. data/lib/chef/provider/file.rb +15 -5
  81. data/lib/chef/provider/group.rb +6 -2
  82. data/lib/chef/provider/group/windows.rb +12 -2
  83. data/lib/chef/provider/http_request.rb +3 -2
  84. data/lib/chef/provider/package.rb +1 -0
  85. data/lib/chef/provider/package/aix.rb +1 -1
  86. data/lib/chef/provider/service/debian.rb +7 -2
  87. data/lib/chef/resource/file.rb +8 -1
  88. data/lib/chef/resource/package.rb +9 -0
  89. data/lib/chef/resource/service.rb +0 -1
  90. data/lib/chef/rest.rb +2 -0
  91. data/lib/chef/run_context.rb +1 -1
  92. data/lib/chef/util/file_edit.rb +1 -1
  93. data/lib/chef/util/windows/net_group.rb +7 -6
  94. data/lib/chef/version.rb +1 -1
  95. data/lib/chef/win32/version.rb +31 -18
  96. data/spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed +1 -0
  97. data/spec/functional/resource/file_spec.rb +0 -1
  98. data/spec/functional/resource/group_spec.rb +96 -16
  99. data/spec/functional/resource/package_spec.rb +17 -0
  100. data/spec/functional/resource/user_spec.rb +2 -2
  101. data/spec/functional/win32/versions_spec.rb +39 -0
  102. data/spec/integration/client/client_spec.rb +27 -28
  103. data/spec/spec_helper.rb +2 -0
  104. data/spec/support/platform_helpers.rb +7 -1
  105. data/spec/support/shared/functional/file_resource.rb +83 -43
  106. data/spec/unit/application_spec.rb +7 -5
  107. data/spec/unit/client_spec.rb +10 -3
  108. data/spec/unit/config_spec.rb +0 -30
  109. data/spec/unit/cookbook_spec.rb +1 -0
  110. data/spec/unit/data_bag_item_spec.rb +8 -0
  111. data/spec/unit/data_bag_spec.rb +6 -0
  112. data/spec/unit/http_spec.rb +48 -0
  113. data/spec/unit/knife/core/subcommand_loader_spec.rb +77 -1
  114. data/spec/unit/knife/ssh_spec.rb +107 -0
  115. data/spec/unit/mixin/path_sanity_spec.rb +6 -0
  116. data/spec/unit/mixin/securable_spec.rb +77 -3
  117. data/spec/unit/monologger_spec.rb +45 -0
  118. data/spec/unit/node_spec.rb +16 -0
  119. data/spec/unit/policy_builder/expand_node_object_spec.rb +320 -0
  120. data/spec/unit/policy_builder/policyfile_spec.rb +399 -0
  121. data/spec/unit/policy_builder_spec.rb +26 -0
  122. data/spec/unit/provider/deploy_spec.rb +3 -0
  123. data/spec/unit/provider/group/windows_spec.rb +1 -0
  124. data/spec/unit/provider/http_request_spec.rb +23 -1
  125. data/spec/unit/provider/service/debian_service_spec.rb +50 -19
  126. data/spec/unit/recipe_spec.rb +4 -0
  127. data/spec/unit/resource/package_spec.rb +5 -0
  128. data/spec/unit/rest_spec.rb +375 -278
  129. data/spec/unit/run_context_spec.rb +4 -0
  130. metadata +96 -59
  131. checksums.yaml +0 -7
@@ -31,7 +31,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
31
31
  .\" Man page generated from reStructuredText.
32
32
  .
33
33
  .sp
34
- When a node runs the chef\-client for the first time, it generally does not yet have an API client identity, and so it cannot make authenticated requests to the server. This is where the validation client\-\-\-known as the chef\-validator\-\-\-comes in. When the chef\-client runs, it checks if it has a client key. If the client key does not exist, it then attempts to borrow the identity of the chef\-validator to register itself with the server. In order to register with the server, the private key for the chef\-validator needs to be copied to the host and placed in /etc/chef/validation.pem.
34
+ When a node runs the chef\-client for the first time, it generally does not yet have an API client identity, and so it cannot make authenticated requests to the server. This is where the validation client\-\-\-known as the chef\-validator\-\-\-comes in. When the chef\-client runs, it checks if it has a client key. If the client key does not exist, it then attempts to borrow the identity of the chef\-validator to register itself with the server. In order to register with the server, the private key for the chef\-validator needs to be copied to the host and placed in \fB/etc/chef/validation.pem\fP.
35
35
  .sp
36
36
  Once the chef\-client has registered itself with the server, it no longer uses the validation client for anything. It is recommended that you delete the private key for the chef\-validator from the host after the host has registered or use the \fBdelete_validation\fP recipe that can be found in the \fBchef\-client\fP cookbook (\fI\%https://github.com/opscode-cookbooks/chef-client\fP).
37
37
  .sp
@@ -46,14 +46,14 @@ $ knife client [ARGUMENT] (options)
46
46
  .fi
47
47
  .SH COMMON OPTIONS
48
48
  .sp
49
- The following options can be run with all Knife sub\-commands and plug\-ins:
49
+ The following options may be used with any of the arguments available to the \fBknife client\fP subcommand:
50
50
  .INDENT 0.0
51
51
  .TP
52
- .B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
53
- The configuration file to use.
52
+ .B \fB\-\-chef\-zero\-port PORT\fP
53
+ The port on which chef\-zero will listen.
54
54
  .TP
55
- .B \fB\-\-color\fP
56
- Indicates that colored output will be used.
55
+ .B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
56
+ The configuration file to use.
57
57
  .TP
58
58
  .B \fB\-d\fP, \fB\-\-disable\-editing\fP
59
59
  Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -67,9 +67,6 @@ The $EDITOR that is used for all interactive commands.
67
67
  .B \fB\-E ENVIRONMENT\fP, \fB\-\-environment ENVIRONMENT\fP
68
68
  The name of the environment. When this option is added to a command, the command will run only against the named environment.
69
69
  .TP
70
- .B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
71
- Indicates that the private key will be saved to a specified file name.
72
- .TP
73
70
  .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
74
71
  The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
75
72
  .TP
@@ -79,11 +76,8 @@ Shows help for the command.
79
76
  .B \fB\-k KEY\fP, \fB\-\-key KEY\fP
80
77
  The private key that Knife will use to sign requests made by the API client to the server.
81
78
  .TP
82
- .B \fB\-\-no\-color\fP
83
- Indicates that color will not be used in the output.
84
- .TP
85
- .B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
86
- The user password.
79
+ .B \fB\-\-[no\-]color\fP
80
+ Indicates whether colored output will be used.
87
81
  .TP
88
82
  .B \fB\-\-print\-after\fP
89
83
  Indicates that data will be shown after a destructive operation.
@@ -94,14 +88,17 @@ The URL for the server.
94
88
  .B \fB\-u USER\fP, \fB\-\-user USER\fP
95
89
  The user name used by Knife to sign requests made by the API client to the server. Authentication will fail if the user name does not match the private key.
96
90
  .TP
97
- .B \fB\-v\fP, \fB\-\-version\fP
98
- The version of the chef\-client.
99
- .TP
100
91
  .B \fB\-V\fP, \fB\-\-verbose\fP
101
92
  Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
102
93
  .TP
94
+ .B \fB\-v\fP, \fB\-\-version\fP
95
+ The version of the chef\-client.
96
+ .TP
103
97
  .B \fB\-y\fP, \fB\-\-yes\fP
104
98
  Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
99
+ .TP
100
+ .B \fB\-z\fP, \fB\-\-local\-mode\fP
101
+ Indicates that the chef\-client will be run in local mode, which allows all commands that work against the server to also work against the local chef\-repo.
105
102
  .UNINDENT
106
103
  .SH BULK DELETE
107
104
  .sp
@@ -125,9 +122,9 @@ This command does not have any specific options.
125
122
  The \fBcreate\fP argument is used to create a new API client. This process will generate an RSA key pair for the named API client. The public key will be stored on the server and the private key will be displayed on \fBSTDOUT\fP or written to a named file.
126
123
  .INDENT 0.0
127
124
  .IP \(bu 2
128
- For the chef\-client, the private key should be copied to the system as /etc/chef/client.pem.
125
+ For the chef\-client, the private key should be copied to the system as \fB/etc/chef/client.pem\fP.
129
126
  .IP \(bu 2
130
- For Knife, the private key is typically copied to ~/.chef/client_name.pem and referenced in the knife.rb configuration file.
127
+ For Knife, the private key is typically copied to \fB~/.chef/client_name.pem\fP and referenced in the knife.rb configuration file.
131
128
  .UNINDENT
132
129
  .sp
133
130
  \fBSyntax\fP
@@ -146,7 +143,7 @@ This argument has the following options:
146
143
  .INDENT 0.0
147
144
  .TP
148
145
  .B \fB\-a\fP, \fB\-\-admin\fP
149
- Indicates that a client will be created as an admin client. This is required when users of the open source server need to access the Chef Server API as an administrator. This option only works when used with the open source server and will have no effect when used with Hosted Chef or Private Chef.
146
+ Indicates that a client will be created as an admin client. This is required when users of the open source server need to access the Chef Server API as an administrator. This option only works when used with the open source server and will have no effect when used with Enterprise Chef.
150
147
  .UNINDENT
151
148
  .sp
152
149
  \fBExamples\fP
@@ -159,7 +156,7 @@ $ knife client create exampleorg \-a \-f "/etc/chef/client.pem"
159
156
  .ft P
160
157
  .fi
161
158
  .sp
162
- When running the \fBcreate\fP argument on Hosted Chef or Private Chef, be sure to omit the \fB\-a\fP option:
159
+ When running the \fBcreate\fP argument on Enterprise Chef, be sure to omit the \fB\-a\fP option:
163
160
  .sp
164
161
  .nf
165
162
  .ft C
@@ -363,6 +360,6 @@ $ knife role show devops \-F json
363
360
  .sp
364
361
  Other formats available include \fBtext\fP, \fByaml\fP, and \fBpp\fP.
365
362
  .SH AUTHOR
366
- Opscode
363
+ Chef
367
364
  .\" Generated by docutils manpage writer.
368
365
  .
@@ -33,16 +33,35 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
33
33
  .sp
34
34
  The \fBknife configure\fP subcommand is used to create the knife.rb and client.rb files so that they can be distributed to workstations and nodes.
35
35
  .sp
36
- \fBCommon Options\fP
36
+ \fBSyntax\fP
37
+ .sp
38
+ This argument has the following syntax:
39
+ .sp
40
+ .nf
41
+ .ft C
42
+ $ knife configure (options)
43
+ .ft P
44
+ .fi
45
+ .sp
46
+ \fBOptions\fP
37
47
  .sp
38
- The following options can be run with all Knife sub\-commands and plug\-ins:
48
+ This subcommand has the following options:
39
49
  .INDENT 0.0
40
50
  .TP
41
- .B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
51
+ .B \fB\-\-admin\-client\-key PATH\fP
52
+ The path to the private key used by the client, typically a file named \fBadmin.pem\fP.
53
+ .TP
54
+ .B \fB\-\-admin\-client\-name NAME\fP
55
+ The name of the client, typically the name of the admin client.
56
+ .TP
57
+ .B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
42
58
  The configuration file to use.
43
59
  .TP
44
- .B \fB\-\-color\fP
45
- Indicates that colored output will be used.
60
+ .B \fB\-\-chef\-zero\-port PORT\fP
61
+ The port on which chef\-zero will listen.
62
+ .TP
63
+ .B \fB\-\-[no\-]color\fP
64
+ Indicates whether colored output will be used.
46
65
  .TP
47
66
  .B \fB\-d\fP, \fB\-\-disable\-editing\fP
48
67
  Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -56,27 +75,24 @@ The $EDITOR that is used for all interactive commands.
56
75
  .B \fB\-E ENVIRONMENT\fP, \fB\-\-environment ENVIRONMENT\fP
57
76
  The name of the environment. When this option is added to a command, the command will run only against the named environment.
58
77
  .TP
59
- .B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
60
- Indicates that the private key will be saved to a specified file name.
61
- .TP
62
78
  .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
63
79
  The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
64
80
  .TP
65
81
  .B \fB\-h\fP, \fB\-\-help\fP
66
82
  Shows help for the command.
67
83
  .TP
84
+ .B \fB\-i\fP, \fB\-\-initial\fP
85
+ Use to create a API client, typically an administrator client on a freshly\-installed server.
86
+ .TP
68
87
  .B \fB\-k KEY\fP, \fB\-\-key KEY\fP
69
88
  The private key that Knife will use to sign requests made by the API client to the server.
70
89
  .TP
71
- .B \fB\-\-no\-color\fP
72
- Indicates that color will not be used in the output.
73
- .TP
74
- .B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
75
- The user password.
76
- .TP
77
90
  .B \fB\-\-print\-after\fP
78
91
  Indicates that data will be shown after a destructive operation.
79
92
  .TP
93
+ .B \fB\-r REPO\fP, \fB\-\-repository REPO\fP
94
+ The path to the chef\-repo.
95
+ .TP
80
96
  .B \fB\-s URL\fP, \fB\-\-server\-url URL\fP
81
97
  The URL for the server.
82
98
  .TP
@@ -89,42 +105,17 @@ The version of the chef\-client.
89
105
  .B \fB\-V\fP, \fB\-\-verbose\fP
90
106
  Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
91
107
  .TP
92
- .B \fB\-y\fP, \fB\-\-yes\fP
93
- Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
94
- .UNINDENT
95
- .sp
96
- \fBSyntax\fP
97
- .sp
98
- This argument has the following syntax:
99
- .sp
100
- .nf
101
- .ft C
102
- $ knife configure (options)
103
- .ft P
104
- .fi
105
- .sp
106
- \fBOptions\fP
107
- .sp
108
- This subcommand has the following options:
109
- .INDENT 0.0
110
- .TP
111
- .B \fB\-\-admin\-client\-name NAME\fP
112
- The name of the client, typically the name of the admin client.
113
- .TP
114
- .B \fB\-\-admin\-client\-key PATH\fP
115
- The path to the private key used by the client, typically a file named \fBadmin.pem\fP.
116
- .TP
117
- .B \fB\-i\fP, \fB\-\-initial\fP
118
- Use to create a API client, typically an administrator client on a freshly\-installed server.
119
- .TP
120
- .B \fB\-r REPO\fP, \fB\-\-repository REPO\fP
121
- The path to the chef\-repo.
122
- .TP
123
108
  .B \fB\-\-validation\-client\-name NAME\fP
124
109
  The name of the validation client.
125
110
  .TP
126
111
  .B \fB\-\-validation\-key PATH\fP
127
112
  The path to the validation key used by the client, typically a file named \fBvalidation.pem\fP.
113
+ .TP
114
+ .B \fB\-y\fP, \fB\-\-yes\fP
115
+ Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
116
+ .TP
117
+ .B \fB\-z\fP, \fB\-\-local\-mode\fP
118
+ Indicates that the chef\-client will be run in local mode, which allows all commands that work against the server to also work against the local chef\-repo.
128
119
  .UNINDENT
129
120
  .sp
130
121
  \fBExamples\fP
@@ -145,6 +136,6 @@ $ knife configure client \(aq/directory\(aq
145
136
  .ft P
146
137
  .fi
147
138
  .SH AUTHOR
148
- Opscode
139
+ Chef
149
140
  .\" Generated by docutils manpage writer.
150
141
  .
@@ -44,14 +44,14 @@ $ knife cookbook site [ARGUMENT] (options)
44
44
  .fi
45
45
  .SH COMMON OPTIONS
46
46
  .sp
47
- The following options can be run with all Knife sub\-commands and plug\-ins:
47
+ The following options may be used with any of the arguments available to the \fBknife cookbook site\fP subcommand:
48
48
  .INDENT 0.0
49
49
  .TP
50
- .B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
51
- The configuration file to use.
50
+ .B \fB\-\-chef\-zero\-port PORT\fP
51
+ The port on which chef\-zero will listen.
52
52
  .TP
53
- .B \fB\-\-color\fP
54
- Indicates that colored output will be used.
53
+ .B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
54
+ The configuration file to use.
55
55
  .TP
56
56
  .B \fB\-d\fP, \fB\-\-disable\-editing\fP
57
57
  Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -65,9 +65,6 @@ The $EDITOR that is used for all interactive commands.
65
65
  .B \fB\-E ENVIRONMENT\fP, \fB\-\-environment ENVIRONMENT\fP
66
66
  The name of the environment. When this option is added to a command, the command will run only against the named environment.
67
67
  .TP
68
- .B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
69
- Indicates that the private key will be saved to a specified file name.
70
- .TP
71
68
  .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
72
69
  The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
73
70
  .TP
@@ -77,11 +74,8 @@ Shows help for the command.
77
74
  .B \fB\-k KEY\fP, \fB\-\-key KEY\fP
78
75
  The private key that Knife will use to sign requests made by the API client to the server.
79
76
  .TP
80
- .B \fB\-\-no\-color\fP
81
- Indicates that color will not be used in the output.
82
- .TP
83
- .B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
84
- The user password.
77
+ .B \fB\-\-[no\-]color\fP
78
+ Indicates whether colored output will be used.
85
79
  .TP
86
80
  .B \fB\-\-print\-after\fP
87
81
  Indicates that data will be shown after a destructive operation.
@@ -92,14 +86,17 @@ The URL for the server.
92
86
  .B \fB\-u USER\fP, \fB\-\-user USER\fP
93
87
  The user name used by Knife to sign requests made by the API client to the server. Authentication will fail if the user name does not match the private key.
94
88
  .TP
95
- .B \fB\-v\fP, \fB\-\-version\fP
96
- The version of the chef\-client.
97
- .TP
98
89
  .B \fB\-V\fP, \fB\-\-verbose\fP
99
90
  Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
100
91
  .TP
92
+ .B \fB\-v\fP, \fB\-\-version\fP
93
+ The version of the chef\-client.
94
+ .TP
101
95
  .B \fB\-y\fP, \fB\-\-yes\fP
102
96
  Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
97
+ .TP
98
+ .B \fB\-z\fP, \fB\-\-local\-mode\fP
99
+ Indicates that the chef\-client will be run in local mode, which allows all commands that work against the server to also work against the local chef\-repo.
103
100
  .UNINDENT
104
101
  .SH DOWNLOAD
105
102
  .sp
@@ -472,6 +469,6 @@ $ knife cookbook site unshare getting\-started
472
469
  .ft P
473
470
  .fi
474
471
  .SH AUTHOR
475
- Opscode
472
+ Chef
476
473
  .\" Generated by docutils manpage writer.
477
474
  .
@@ -64,14 +64,14 @@ $ knife cookbook [ARGUMENT] (options)
64
64
  .fi
65
65
  .SH COMMON OPTIONS
66
66
  .sp
67
- The following options can be run with all Knife sub\-commands and plug\-ins:
67
+ The following options may be used with any of the arguments available to the \fBknife cookbook\fP subcommand:
68
68
  .INDENT 0.0
69
69
  .TP
70
- .B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
71
- The configuration file to use.
70
+ .B \fB\-\-chef\-zero\-port PORT\fP
71
+ The port on which chef\-zero will listen.
72
72
  .TP
73
- .B \fB\-\-color\fP
74
- Indicates that colored output will be used.
73
+ .B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
74
+ The configuration file to use.
75
75
  .TP
76
76
  .B \fB\-d\fP, \fB\-\-disable\-editing\fP
77
77
  Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -85,9 +85,6 @@ The $EDITOR that is used for all interactive commands.
85
85
  .B \fB\-E ENVIRONMENT\fP, \fB\-\-environment ENVIRONMENT\fP
86
86
  The name of the environment. When this option is added to a command, the command will run only against the named environment.
87
87
  .TP
88
- .B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
89
- Indicates that the private key will be saved to a specified file name.
90
- .TP
91
88
  .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
92
89
  The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
93
90
  .TP
@@ -97,11 +94,8 @@ Shows help for the command.
97
94
  .B \fB\-k KEY\fP, \fB\-\-key KEY\fP
98
95
  The private key that Knife will use to sign requests made by the API client to the server.
99
96
  .TP
100
- .B \fB\-\-no\-color\fP
101
- Indicates that color will not be used in the output.
102
- .TP
103
- .B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
104
- The user password.
97
+ .B \fB\-\-[no\-]color\fP
98
+ Indicates whether colored output will be used.
105
99
  .TP
106
100
  .B \fB\-\-print\-after\fP
107
101
  Indicates that data will be shown after a destructive operation.
@@ -112,14 +106,17 @@ The URL for the server.
112
106
  .B \fB\-u USER\fP, \fB\-\-user USER\fP
113
107
  The user name used by Knife to sign requests made by the API client to the server. Authentication will fail if the user name does not match the private key.
114
108
  .TP
115
- .B \fB\-v\fP, \fB\-\-version\fP
116
- The version of the chef\-client.
117
- .TP
118
109
  .B \fB\-V\fP, \fB\-\-verbose\fP
119
110
  Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
120
111
  .TP
112
+ .B \fB\-v\fP, \fB\-\-version\fP
113
+ The version of the chef\-client.
114
+ .TP
121
115
  .B \fB\-y\fP, \fB\-\-yes\fP
122
116
  Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
117
+ .TP
118
+ .B \fB\-z\fP, \fB\-\-local\-mode\fP
119
+ Indicates that the chef\-client will be run in local mode, which allows all commands that work against the server to also work against the local chef\-repo.
123
120
  .UNINDENT
124
121
  .SH BULK DELETE
125
122
  .sp
@@ -206,7 +203,7 @@ This argument has the following options:
206
203
  The name of the copyright holder. This option will place a copyright notice that contains the name of the copyright holder in each of the pre\-created files. If this option is not specified, a copyright name of "your_company_name" will be used instead; it can be easily modified later.
207
204
  .TP
208
205
  .B \fB\-I LICENSE\fP, \fB\-\-license LICENSE\fP
209
- The type of license under which a cookbook is distributed: \fBapachev2\fP, \fBgplv2\fP, \fBgplv3\fP, \fBmit\fP, or \fBnone\fP (default). This option will place the appropriate license notice in the pre\-created files. Be aware of the licenses for files inside of a cookbook and be sure to follow any restrictions they describe.
206
+ The type of license under which a cookbook is distributed: \fBapachev2\fP, \fBgplv2\fP, \fBgplv3\fP, \fBmit\fP, or \fBnone\fP (default). This option will place the appropriate license notice in the pre\-created files: \fBApache v2.0\fP (for \fBapachev2\fP), \fBGPL v2\fP (for \fBgplv2\fP), \fBGPL v3\fP (for \fBgplv3\fP), \fBMIT\fP (for \fBmit\fP), or \fBlicense \(aqProprietary \- All Rights Reserved\fP (for \fBnone\fP). Be aware of the licenses for files inside of a cookbook and be sure to follow any restrictions they describe.
210
207
  .TP
211
208
  .B \fB\-m EMAIL\fP, \fB\-\-email EMAIL\fP
212
209
  The email address for the individual who maintains the cookbook. This option will place an email address in each of the pre\-created files. If this option is not specified, an email name of "your_email" will be used instead; it can be easily modified later.
@@ -637,6 +634,6 @@ ERROR: Version 0.1.6 of cookbook redis is frozen. Use \-\-force to override.
637
634
  .ft P
638
635
  .fi
639
636
  .SH AUTHOR
640
- Opscode
637
+ Chef
641
638
  .\" Generated by docutils manpage writer.
642
639
  .
@@ -46,14 +46,14 @@ $ knife data bag [ARGUMENT] (options)
46
46
  .fi
47
47
  .SH COMMON OPTIONS
48
48
  .sp
49
- The following options can be run with all Knife sub\-commands and plug\-ins:
49
+ The following options may be used with any of the arguments available to the \fBknife data bag\fP subcommand:
50
50
  .INDENT 0.0
51
51
  .TP
52
- .B \fB\-c CONFIG\fP, \fB\-\-config CONFIG\fP
53
- The configuration file to use.
52
+ .B \fB\-\-chef\-zero\-port PORT\fP
53
+ The port on which chef\-zero will listen.
54
54
  .TP
55
- .B \fB\-\-color\fP
56
- Indicates that colored output will be used.
55
+ .B \fB\-c CONFIG_FILE\fP, \fB\-\-config CONFIG_FILE\fP
56
+ The configuration file to use.
57
57
  .TP
58
58
  .B \fB\-d\fP, \fB\-\-disable\-editing\fP
59
59
  Indicates that $EDITOR will not be opened; data will be accepted as\-is.
@@ -67,9 +67,6 @@ The $EDITOR that is used for all interactive commands.
67
67
  .B \fB\-E ENVIRONMENT\fP, \fB\-\-environment ENVIRONMENT\fP
68
68
  The name of the environment. When this option is added to a command, the command will run only against the named environment.
69
69
  .TP
70
- .B \fB\-f FILE_NAME\fP, \fB\-\-file FILE_NAME\fP
71
- Indicates that the private key will be saved to a specified file name.
72
- .TP
73
70
  .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
74
71
  The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
75
72
  .TP
@@ -79,11 +76,8 @@ Shows help for the command.
79
76
  .B \fB\-k KEY\fP, \fB\-\-key KEY\fP
80
77
  The private key that Knife will use to sign requests made by the API client to the server.
81
78
  .TP
82
- .B \fB\-\-no\-color\fP
83
- Indicates that color will not be used in the output.
84
- .TP
85
- .B \fB\-p PASSWORD\fP, \fB\-\-password PASSWORD\fP
86
- The user password.
79
+ .B \fB\-\-[no\-]color\fP
80
+ Indicates whether colored output will be used.
87
81
  .TP
88
82
  .B \fB\-\-print\-after\fP
89
83
  Indicates that data will be shown after a destructive operation.
@@ -94,14 +88,17 @@ The URL for the server.
94
88
  .B \fB\-u USER\fP, \fB\-\-user USER\fP
95
89
  The user name used by Knife to sign requests made by the API client to the server. Authentication will fail if the user name does not match the private key.
96
90
  .TP
97
- .B \fB\-v\fP, \fB\-\-version\fP
98
- The version of the chef\-client.
99
- .TP
100
91
  .B \fB\-V\fP, \fB\-\-verbose\fP
101
92
  Set for more verbose outputs. Use \fB\-VV\fP for maximum verbosity.
102
93
  .TP
94
+ .B \fB\-v\fP, \fB\-\-version\fP
95
+ The version of the chef\-client.
96
+ .TP
103
97
  .B \fB\-y\fP, \fB\-\-yes\fP
104
98
  Indicates that the response to all confirmation prompts will be "Yes" (and that Knife will not ask for confirmation).
99
+ .TP
100
+ .B \fB\-z\fP, \fB\-\-local\-mode\fP
101
+ Indicates that the chef\-client will be run in local mode, which allows all commands that work against the server to also work against the local chef\-repo.
105
102
  .UNINDENT
106
103
  .SH CREATE
107
104
  .sp
@@ -481,6 +478,6 @@ $ knife data bag show admins \-F json
481
478
  .sp
482
479
  Other formats available include \fBtext\fP, \fByaml\fP, and \fBpp\fP.
483
480
  .SH AUTHOR
484
- Opscode
481
+ Chef
485
482
  .\" Generated by docutils manpage writer.
486
483
  .