Skip to content

Commit a7b97e7

Browse files
authored
Merge branch 'main' into jfm/chef-removing-windows-2012-support
2 parents 3f08280 + d9f1cd5 commit a7b97e7

File tree

11 files changed

+181
-168
lines changed

11 files changed

+181
-168
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-20241212065721-f1621731d636
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

content/azure_chef_cli.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Windows PowerShell cmdlets and two Microsoft Azure CLI commands.
2222

2323
If the Microsoft Azure [cross-platform command line tool
2424
(Xplat-CLI)](https://github.com/Azure/azure-xplat-cli) is installed on
25-
the workstation, along with the Azure Chef Extension, the `get-chef` and
26-
`set-chef` extensions may be used to manage Chef running on virtual
25+
the workstation along with the Azure Chef Extension, you can use the `get-chef` and
26+
`set-chef` extensions to manage Chef running on virtual
2727
machines in Microsoft Azure.
2828

2929
### get-chef
@@ -125,7 +125,7 @@ azure vm extension set-chef your-vm-name --validation-pem ~/chef-repo/.chef/test
125125
azure vm extension set-chef your-vm-name --validation-pem ~/chef-repo/.chef/testorg-validator.pem --client-config ~/chef-repo/.chef/client.rb --version "1201.12" -R 'recipe[your_cookbook_name::your_recipe_name]'
126126
```
127127

128-
##### Azure Resource Manager (ARM) Templates
128+
##### Azure Resource Manager (ARM) templates
129129

130130
If you are using Azure Resource Manager templates to create your infrastructure you can use the Chef extension to have Azure handle the bootstrapping/configuration of your node to your Chef Infra Server.
131131

@@ -222,7 +222,7 @@ The extension has the following options that can be provided in the
222222

223223
: Verify the SSL certificate on the Chef Infra Server. When `true`, Chef Infra Client always verifies the SSL certificate. When `false`, Chef Infra Client uses the value of `ssl_verify_mode` to determine if the SSL certificate requires verification.
224224

225-
#### Protected Settings
225+
#### Protected settings
226226

227227
The following options can be provided to the extension through the `protectedSettings` hash:
228228

@@ -240,9 +240,9 @@ The following options can be provided to the extension through the `protectedSet
240240

241241
### Examples
242242

243-
The following examples show how Chef Infra Client can be installed and configured from an ARM template.
243+
The following examples show how you can install and configure Chef Infra Client from an ARM template.
244244

245-
#### Installing the Azure Chef extension on a Linux system
245+
#### Install the Azure Chef extension on a Linux system
246246

247247
```json
248248
{
@@ -270,7 +270,7 @@ The following examples show how Chef Infra Client can be installed and configure
270270
}
271271
```
272272

273-
#### Installing the Azure Chef extension on a Windows system
273+
#### Install the Azure Chef extension on a Windows system
274274

275275
```json
276276
{
@@ -289,7 +289,7 @@ The following examples show how Chef Infra Client can be installed and configure
289289
"validation_client_name": "my-chef-organization-validator"
290290
},
291291
"runlist": "recipe[awesome_customers_windows],recipe[iis],role[windows_base]",
292-
"chef_package_url" : "https://my.packages.chef.io/chef-client-15.11.8-1-x64.msi",
292+
"chef_package_url" : "https://download.example.com/chef-client-15.11.8-1-x64.msi",
293293
"validation_key_format": "plaintext"
294294
},
295295
"protectedSettings": {
@@ -299,7 +299,7 @@ The following examples show how Chef Infra Client can be installed and configure
299299
}
300300
```
301301

302-
#### Installing the Azure Chef extension on a Linux system with SSL peer verification turned off and given a data bag secret
302+
#### Install the Azure Chef extension on a Linux system with SSL peer verification turned off and given a data bag secret
303303

304304
```json
305305
{
@@ -331,6 +331,6 @@ The following examples show how Chef Infra Client can be installed and configure
331331

332332
{{< note >}}
333333

334-
Here we're also base64 encoding our validator key which is a recommended approach when using the Azure Chef extension in an ARM template
334+
In this example the validator key is base64 encoded, which is a recommended approach when using the Azure Chef extension in an ARM template.
335335

336336
{{< /note >}}

content/download/_index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ title = "Download Chef Tools"
33
draft = false
44
gh_repo = "chef-web-docs"
55

6+
aliases = ["/downloads"]
7+
68
[cascade]
79
product = []
810

0 commit comments

Comments
 (0)