Skip to content

Commit 86fc57a

Browse files
authored
Merge branch 'main' into im/eol_hosted_chef
2 parents e1610e8 + deae4d1 commit 86fc57a

File tree

224 files changed

+1450
-1495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+1450
-1495
lines changed

_vendor/github.com/chef/chef-workstation/docs-chef-io/content/workstation/install_workstation.md

Lines changed: 39 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/github.com/chef/chef-workstation/docs-chef-io/content/workstation/knife_ssh.md

Lines changed: 9 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/github.com/chef/compliance-profiles/docs-chef-io/content/release_notes_compliance_profiles.md

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
# github.com/inspec/inspec-azure/docs-chef-io v0.0.0-20240122032234-c1394fc25525
99
# github.com/inspec/inspec-habitat/docs-chef-io v0.0.0-20220218210405-bfd542da49fd
1010
# github.com/inspec/inspec-k8s/docs-chef-io v0.0.0-20240122032042-421355eaf502
11-
# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240809064339-878cb76b2b66
11+
# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20241218133915-0bcc26e757cc
1212
# github.com/chef/supermarket/docs-chef-io v0.0.0-20241105172430-a362eded8f72
1313
# github.com/chef/effortless/docs-chef-io v0.0.0-20230711123605-c8beb79aba4f
14-
# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241106111500-6a8759e49b64
14+
# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241211025148-fb9cb1f3e2bc
1515
# github.com/chef/compliance-remediation-2022/docs-chef-io v0.0.0-20240313054833-ebbc45209efa
1616
# github.com/chef/license-service/docs-chef-io v0.0.0-20231117105514-d3f3d53ba2dd
1717
# github.com/chef/chef-docs-theme v0.0.0-20241206202643-d5ef90c514a1

archetypes/all_the_resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The following properties are common to every resource:
7070
`sensitive`
7171
: **Ruby Type:** true, false | **Default Value:** `false`
7272

73-
Ensure that sensitive resource data is not logged by Chef Infra Client.
73+
Ensure that sensitive resource data isn't logged by Chef Infra Client.
7474

7575
#### Examples
7676

config/_default/menu.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,14 @@ identifier = "chef_infra"
476476
parent = "chef_infra/features"
477477
weight = 20
478478

479+
[[infra]]
480+
title = "Target Mode"
481+
identifier = "chef_infra/features/Target Mode"
482+
parent = "chef_infra/features"
483+
url = "/target_mode/"
484+
weight = 80
485+
486+
479487
[[infra]]
480488
title = "Integrations"
481489
identifier = "chef_infra/integrations"

content/api_omnitruck.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Omnitruck accepts the following platforms:
130130
<td>Windows</td>
131131
<td><code>windows</code></td>
132132
<td><code>x86_64</code>, <code>i386</code></td>
133-
<td><code>7</code>, <code>8</code>, <code>10</code>, <span class="title-ref">2008r2</span>, <code>2012</code>, <code>2012r2</code>, <code>2016</code>, <code>2019</code>, <code>11</code>, <code>2022</code></td>
133+
<td><code>10</code>, <span class="title-ref">2016</span>, <code>2019</code>, <code>11</code>, <code>2022</code></td>
134134
</tr>
135135
</tbody>
136136
</table>

content/attribute_arrays.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ override_attributes(
2929
)
3030
```
3131

32-
But what if all of the web servers are not the same? What if some of the web servers required a single attribute to have a different value? You could store these settings in two locations, once just like the preceding example and once just like the following:
32+
But what if all of the web servers aren't the same? What if some of the web servers required a single attribute to have a different value? You could store these settings in two locations, once just like the preceding example and once just like the following:
3333

3434
```ruby
3535
override_attributes(
@@ -44,7 +44,7 @@ override_attributes(
4444
)
4545
```
4646

47-
But that is not efficient, especially because most of them are identical. The deep merge capabilities of Chef Infra Client allows attributes to be layered across cookbooks, recipes, roles, and environments. This allows an attribute to be reused across nodes, making use of default attributes set at the cookbook level, but also providing a way for certain attributes (with a higher attribute precedence) to be applied only when they are supposed to be.
47+
But that isn't efficient, especially because most of them are identical. The deep merge capabilities of Chef Infra Client allows attributes to be layered across cookbooks, recipes, roles, and environments. This allows an attribute to be reused across nodes, making use of default attributes set at the cookbook level, but also providing a way for certain attributes (with a higher attribute precedence) to be applied only when they're supposed to be.
4848

4949
For example, a role named `baseline.rb`:
5050

@@ -115,7 +115,7 @@ to produce results like this:
115115
}
116116
```
117117

118-
Even though the `web.rb` file does not contain attributes and values for `minspareservers`, `maxspareservers`, `serverlimit`, `maxclients`, and `maxrequestsperchild`, the deep merge capabilities pulled them in.
118+
Even though the `web.rb` file doesn't contain attributes and values for `minspareservers`, `maxspareservers`, `serverlimit`, `maxclients`, and `maxrequestsperchild`, the deep merge capabilities pulled them in.
119119

120120
## Attribute Array Logic
121121

@@ -153,7 +153,7 @@ role_or_environment 2 { :x => '1' , :y => '2' }
153153
{ :x => '1', :y => '2' }
154154
```
155155

156-
When items cannot be merged through substitution, the original data is overwritten.
156+
When items can't be merged through substitution, the original data is overwritten.
157157

158158
### Addition
159159

content/attribute_precedence.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The attribute precedence order for the sources "roles" and "environments" are op
2929
Applying the role `override` first lets you use the same role in a set of environments.
3030
Applying the environment `override` on top of the role `override` lets you define a subset of these with environment-specific settings.
3131

32-
This is useful if you have an environment that is different within a sub-set of a role. For example, the role for an application server may exist in all environments, but one environment may use a different database server.
32+
This is useful if you have an environment that's different within a sub-set of a role. For example, the role for an application server may exist in all environments, but one environment may use a different database server.
3333

3434
{{< /note >}}
3535

@@ -211,7 +211,7 @@ node.default['foo'] = {
211211
And some role attributes:
212212

213213
```ruby
214-
# Please do not ever do this in real code :)
214+
# Please don't ever do this in real code :)
215215
node.role_default['foo']['bar']['thing'] = 'otherstuff'
216216
```
217217

@@ -227,7 +227,7 @@ When the default attribute precedence `node['foo']['bar']` is removed:
227227
node.rm_default('foo', 'bar') #=> {'baz' => 52, 'thing' => 'allthestuff'}
228228
```
229229

230-
What is left under `'foo'` is only `'bat'`:
230+
What's left under `'foo'` is only `'bat'`:
231231

232232
```ruby
233233
node.attributes.combined_default['foo'] #=> {'bat' => { 'things' => [5,6] } }
@@ -252,7 +252,7 @@ node.default['foo'] = {
252252
And some role attributes:
253253

254254
```ruby
255-
# Please do not ever do this in real code :)
255+
# Please don't ever do this in real code :)
256256
node.role_default['foo']['bar']['thing'] = 'otherstuff'
257257
```
258258

@@ -425,7 +425,7 @@ Given the following code structure:
425425

426426
```ruby
427427
node.default['foo']['bar'] = {'a' => 'b'}
428-
# Please do not ever do this in real code :)
428+
# Please don't ever do this in real code :)
429429
node.role_default['foo']['bar'] = {'c' => 'd'}
430430
node.default!['foo']['bar'] = {'d' => 'e'}
431431
```
@@ -443,7 +443,7 @@ Given the following code structure:
443443

444444
```ruby
445445
node.default['foo']['bar'] = {'a' => 'b'}
446-
# Please do not ever do this in real code :)
446+
# Please don't ever do this in real code :)
447447
node.role_default['foo']['bar'] = {'c' => 'd'}
448448
node.force_default!['foo']['bar'] = {'d' => 'e'}
449449
```
@@ -473,7 +473,7 @@ node.default['foo'] = {
473473
And some attributes:
474474

475475
```ruby
476-
# Please do not ever do this in real code :)
476+
# Please don't ever do this in real code :)
477477
node.role_default['foo']['bar']['baz'] = 55
478478
node.force_default['foo']['bar']['baz'] = 66
479479
```

content/attribute_sources.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ draft = false
1010
+++
1111
<!-- markdownlint-disable-file MD036 -->
1212

13-
Chef Infra Client evaluates attributes in the order that they are defined in the
13+
Chef Infra Client evaluates attributes in the order that they're defined in the
1414
run-list, including any attributes that are in the run-list as
1515
cookbook dependencies.
1616

@@ -87,7 +87,7 @@ of the attribute priority methods:
8787
- `normal_unless`
8888

8989
Use the `_unless` variants carefully (and only when necessary) because
90-
when they are used, attributes applied to nodes may become out of sync
90+
when they're used, attributes applied to nodes may become out of sync
9191
with the values in the cookbooks as these cookbooks are updated. This
9292
approach can create situations where two otherwise identical nodes end
9393
up having slightly different configurations and can also be a challenge
@@ -104,7 +104,7 @@ Use the following methods within the attributes file for a cookbook or within a
104104

105105
### attribute?
106106

107-
A useful method that is related to attributes is the `attribute?`
107+
A useful method that's related to attributes is the `attribute?`
108108
method. This method will check for the existence of an attribute, so
109109
that processing can be done in an attributes file or recipe, but only if
110110
a specific attribute exists.

0 commit comments

Comments
 (0)