Skip to content

Commit

Permalink
Merge branch 'main' into im/eol_hosted_chef
Browse files Browse the repository at this point in the history
  • Loading branch information
IanMadd authored Dec 18, 2024
2 parents e1610e8 + deae4d1 commit 86fc57a
Show file tree
Hide file tree
Showing 224 changed files with 1,450 additions and 1,495 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions _vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
# github.com/inspec/inspec-azure/docs-chef-io v0.0.0-20240122032234-c1394fc25525
# github.com/inspec/inspec-habitat/docs-chef-io v0.0.0-20220218210405-bfd542da49fd
# github.com/inspec/inspec-k8s/docs-chef-io v0.0.0-20240122032042-421355eaf502
# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240809064339-878cb76b2b66
# github.com/chef/chef-workstation/docs-chef-io v0.0.0-20241218133915-0bcc26e757cc
# github.com/chef/supermarket/docs-chef-io v0.0.0-20241105172430-a362eded8f72
# github.com/chef/effortless/docs-chef-io v0.0.0-20230711123605-c8beb79aba4f
# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241106111500-6a8759e49b64
# github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20241211025148-fb9cb1f3e2bc
# github.com/chef/compliance-remediation-2022/docs-chef-io v0.0.0-20240313054833-ebbc45209efa
# github.com/chef/license-service/docs-chef-io v0.0.0-20231117105514-d3f3d53ba2dd
# github.com/chef/chef-docs-theme v0.0.0-20241206202643-d5ef90c514a1
Expand Down
2 changes: 1 addition & 1 deletion archetypes/all_the_resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ The following properties are common to every resource:
`sensitive`
: **Ruby Type:** true, false | **Default Value:** `false`

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

#### Examples

Expand Down
8 changes: 8 additions & 0 deletions config/_default/menu.toml
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,14 @@ identifier = "chef_infra"
parent = "chef_infra/features"
weight = 20

[[infra]]
title = "Target Mode"
identifier = "chef_infra/features/Target Mode"
parent = "chef_infra/features"
url = "/target_mode/"
weight = 80


[[infra]]
title = "Integrations"
identifier = "chef_infra/integrations"
Expand Down
2 changes: 1 addition & 1 deletion content/api_omnitruck.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Omnitruck accepts the following platforms:
<td>Windows</td>
<td><code>windows</code></td>
<td><code>x86_64</code>, <code>i386</code></td>
<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>
<td><code>10</code>, <span class="title-ref">2016</span>, <code>2019</code>, <code>11</code>, <code>2022</code></td>
</tr>
</tbody>
</table>
Expand Down
8 changes: 4 additions & 4 deletions content/attribute_arrays.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ override_attributes(
)
```

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:
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:

```ruby
override_attributes(
Expand All @@ -44,7 +44,7 @@ override_attributes(
)
```

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.
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.

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

Expand Down Expand Up @@ -115,7 +115,7 @@ to produce results like this:
}
```

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.
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.

## Attribute Array Logic

Expand Down Expand Up @@ -153,7 +153,7 @@ role_or_environment 2 { :x => '1' , :y => '2' }
{ :x => '1', :y => '2' }
```

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

### Addition

Expand Down
14 changes: 7 additions & 7 deletions content/attribute_precedence.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The attribute precedence order for the sources "roles" and "environments" are op
Applying the role `override` first lets you use the same role in a set of environments.
Applying the environment `override` on top of the role `override` lets you define a subset of these with environment-specific settings.

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.
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.

{{< /note >}}

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

```ruby
# Please do not ever do this in real code :)
# Please don't ever do this in real code :)
node.role_default['foo']['bar']['thing'] = 'otherstuff'
```

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

What is left under `'foo'` is only `'bat'`:
What's left under `'foo'` is only `'bat'`:

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

```ruby
# Please do not ever do this in real code :)
# Please don't ever do this in real code :)
node.role_default['foo']['bar']['thing'] = 'otherstuff'
```

Expand Down Expand Up @@ -425,7 +425,7 @@ Given the following code structure:

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

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

```ruby
# Please do not ever do this in real code :)
# Please don't ever do this in real code :)
node.role_default['foo']['bar']['baz'] = 55
node.force_default['foo']['bar']['baz'] = 66
```
Expand Down
6 changes: 3 additions & 3 deletions content/attribute_sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ draft = false
+++
<!-- markdownlint-disable-file MD036 -->

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

Expand Down Expand Up @@ -87,7 +87,7 @@ of the attribute priority methods:
- `normal_unless`

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

### attribute?

A useful method that is related to attributes is the `attribute?`
A useful method that's related to attributes is the `attribute?`
method. This method will check for the existence of an attribute, so
that processing can be done in an attributes file or recipe, but only if
a specific attribute exists.
Expand Down
4 changes: 2 additions & 2 deletions content/aws_marketplace.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ AWS provides five VPCs for each region. If you require more VPCs, please contact
1. Set the stack creation options:

Timeout
: If specified and stack creation is not completed in that time, CloudFormation will roll back the stack.
: If specified and stack creation isn't completed in that time, CloudFormation will roll back the stack.

Termination Protection
: Termination protection prevents a user from deleting a stack.
Expand All @@ -118,7 +118,7 @@ For additional information about these options, see [Amazon's documentation on C
1. Open your browser and paste the Chef Automate URL, which will open an alert page.

1. Select **Advanced** and continue.
![Select 'advanced' to bypass the warning that the page is not secure](/images/NotSecurePage.png "Not Secure Page").
![Select 'advanced' to bypass the warning that the page isn't secure](/images/NotSecurePage.png "Not Secure Page").

1. Enter your **Username** and **Password** and select **Sign In**.
![ ](/images/chef_automate_login.png "Chef Automate Login")
Expand Down
Loading

0 comments on commit 86fc57a

Please sign in to comment.