Skip to content

Commit bb90b16

Browse files
IanMaddIanMadd
authored
Merge branch 'main' into im/macos_platform_update
2 parents 630255e + 5104813 commit bb90b16

File tree

9 files changed

+50
-47
lines changed

9 files changed

+50
-47
lines changed

‎_vendor/github.com/chef/chef-server/docs-chef-io/content/server/install_server.md‎

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

‎_vendor/github.com/chef/chef-server/docs-chef-io/content/server/install_server_tiered.md‎

Lines changed: 10 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# github.com/chef/automate/components/docs-chef-io v0.0.0-20250317095354-4cf10eec01e7
22
# github.com/chef/desktop-config/docs-chef-io v0.0.0-20240814044820-5af667d41a43
33
# github.com/habitat-sh/habitat/components/docs-chef-io v0.0.0-20241227173243-de19b906a228
4-
# github.com/chef/chef-server/docs-chef-io v0.0.0-20250303143005-18808e167759
4+
# github.com/chef/chef-server/docs-chef-io v0.0.0-20250414141619-a0fb7ff68e94
55
# github.com/inspec/inspec/docs-chef-io v0.0.0-20250123110211-42364d842e34
66
# github.com/inspec/inspec-alicloud/docs-chef-io v0.0.0-20240122032124-a1d2a214e170
77
# github.com/inspec/inspec-aws/docs-chef-io v0.0.0-20240122032232-049dcf822eef

‎config/_default/params.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ gh_path = "https://github.com/chef/license-service/tree/main/docs-chef-io/conten
6262

6363
[search]
6464

65-
default_search_product_keys = ["", "chef-360-1.2", "automate", "desktop", "habitat", "client", "server", "inspec", "saas", "supermarket", "workstation"]
65+
default_search_product_keys = ["", "chef-360-saas", "chef-360-1.2", "automate", "desktop", "habitat", "client", "server", "inspec", "saas", "supermarket", "workstation"]
6666

6767
[search.products]
6868

@@ -82,6 +82,10 @@ product_version_key = "chef-360-1.1"
8282
name = "1.0"
8383
product_version_key = "chef-360-1.0"
8484

85+
[search.products.360-saas]
86+
name = "360 SaaS"
87+
product_key = "chef-360-saas"
88+
8589
[search.products.automate]
8690
name = "Automate"
8791
product_key = "automate"

‎content/packages.md‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,15 @@ To set up an APT package repository for Debian and Ubuntu platforms:
7575

7676
### Enterprise Linux
7777

78-
To set up a Yum package repository for Enterprise Linux platforms:
78+
{{< note >}}
79+
80+
Starting in Chef Infra Client 18.6.2, we upgraded the GPG signing algorithm used to sign RHEL packages from SHA1 to SHA256. RHEL 9 no longer supports the less secure SHA1 hashes.
81+
82+
{{< /note >}}
83+
84+
Before you begin, verify that you have the `yum-utils` package installed.
85+
86+
To set up a Yum package repository for Enterprise Linux platforms, follow these steps:
7987

8088
1. Install the public key for Chef Software:
8189

@@ -99,20 +107,10 @@ To set up a Yum package repository for Enterprise Linux platforms:
99107
Replace:
100108
101109
- `<CHANNEL>` with the release channel: `stable` or `current`.
102-
- `<VERSION>` with the version Enterprise Linux version.
110+
- `<VERSION>` with the Enterprise Linux version.
103111
104112
1. Update the package repository list:
105113
106114
```bash
107115
sudo yum-config-manager --add-repo chef-stable.repo
108116
```
109-
110-
Note that the `yum-config-manager` command requires the `yum-utils`
111-
package, which isn't installed on CentOS by default. You can
112-
install the package by running `sudo yum install yum-utils`, or you
113-
can use the `mv` command to add the repository to the
114-
`/etc/yum.repos.d/` directory:
115-
116-
```bash
117-
sudo mv chef-stable.repo /etc/yum.repos.d/
118-
```

‎content/reusable/md/infra_lang_method_registry_value_exists_syntax.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The syntax for the `registry_dvalue_exists?` method is as follows:
1+
The syntax for the `registry_value_exists?` method is as follows:
22

33
```ruby
44
registry_value_exists?(

‎content/versions.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ commercial agreement with Chef. Additional information is available in
6767
| Chef Infra Server | 15.x | GA | n/a |
6868
| Chef Habitat | 0.81+ | GA | n/a |
6969
| Chef InSpec | 6.x | GA | n/a |
70-
| Chef Workstation | 22.x (2022), 23.x (2023) | GA | n/a |
70+
| Chef Workstation | 24.x (2024), 25.x (2025) | GA | n/a |
7171

7272
{{< note >}}
7373

@@ -101,22 +101,22 @@ newer versions or products.
101101

102102
## End of Life (EOL) products
103103

104-
| Product | Version | Lifecycle Status | EOL Date |
105-
|--------------------------|---------------------|------------------|-------------------|
106-
| Analytics | All | EOL | December 31, 2018 |
107-
| Chef Automate | 1.x | EOL | December 31, 2019 |
108-
| Chef Infra Client | 16 and under | EOL | November 30, 2022 |
109-
| Chef Compliance Server | All | EOL | December 31, 2018 |
110-
| ChefDK | All | EOL | December 31, 2020 |
111-
| Chef Infra Server | 13.x | EOL | June 30, 2021 |
112-
| Chef InSpec | 2 and under | EOL | December 31, 2019 |
113-
| Chef InSpec | 3.x | EOL | April 30, 2020 |
114-
| Chef InSpec | 4.x | EOL | November 14, 2023 |
115-
| Chef Provisioning | All | EOL | August 31, 2019 |
116-
| Chef Push Jobs | All | EOL | December 31, 2020 |
117-
| Chef Replication/Sync | All | EOL | August 31, 2019 |
118-
| Chef Server DRBD HA | All | EOL | March 31, 2019 |
119-
| Chef Workflow (Delivery) | All | EOL | December 31, 2020 |
120-
| Chef Workstation | 20.12.205 and under | EOL | December 31, 2021 |
121-
| Enterprise Chef | All | EOL | December 31, 2018 |
122-
| Reporting | All | EOL | December 31, 2018 |
104+
| Product | Version | Lifecycle Status | EOL Date |
105+
|--------------------------|----------------------|------------------|-------------------|
106+
| Analytics | All | EOL | December 31, 2018 |
107+
| Chef Automate | 1.x | EOL | December 31, 2019 |
108+
| Chef Infra Client | 16 and under | EOL | November 30, 2022 |
109+
| Chef Compliance Server | All | EOL | December 31, 2018 |
110+
| ChefDK | All | EOL | December 31, 2020 |
111+
| Chef Infra Server | 13.x | EOL | June 30, 2021 |
112+
| Chef InSpec | 2 and under | EOL | December 31, 2019 |
113+
| Chef InSpec | 3.x | EOL | April 30, 2020 |
114+
| Chef InSpec | 4.x | EOL | November 14, 2023 |
115+
| Chef Provisioning | All | EOL | August 31, 2019 |
116+
| Chef Push Jobs | All | EOL | December 31, 2020 |
117+
| Chef Replication/Sync | All | EOL | August 31, 2019 |
118+
| Chef Server DRBD HA | All | EOL | March 31, 2019 |
119+
| Chef Workflow (Delivery) | All | EOL | December 31, 2020 |
120+
| Chef Workstation | 23.12.1055 and under | EOL | December 31, 2024 |
121+
| Enterprise Chef | All | EOL | December 31, 2018 |
122+
| Reporting | All | EOL | December 31, 2018 |

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22
55
require (
66
github.com/chef/automate/components/docs-chef-io v0.0.0-20250317095354-4cf10eec01e7 // indirect
77
github.com/chef/chef-docs-theme v0.0.0-20250217213320-727f9bce8258 // indirect
8-
github.com/chef/chef-server/docs-chef-io v0.0.0-20250303143005-18808e167759 // indirect
8+
github.com/chef/chef-server/docs-chef-io v0.0.0-20250414141619-a0fb7ff68e94 // indirect
99
github.com/chef/chef-workstation/docs-chef-io v0.0.0-20250205062508-ee50345a4044 // indirect
1010
github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20250403124242-2087b16979ee // indirect
1111
github.com/chef/compliance-remediation-2022/docs-chef-io v0.0.0-20250403111641-fada5190e176 // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/chef/automate/components/docs-chef-io v0.0.0-20250317095354-4cf10eec0
22
github.com/chef/automate/components/docs-chef-io v0.0.0-20250317095354-4cf10eec01e7/go.mod h1:juvLC7Rt33YOCgJ5nnfl4rWZRAbSwqjTbWmcAoA0LtU=
33
github.com/chef/chef-docs-theme v0.0.0-20250217213320-727f9bce8258 h1:wpWL3E4Kb6ynNEwilZiKk/clD0g9AjinDB/D+OKeKHU=
44
github.com/chef/chef-docs-theme v0.0.0-20250217213320-727f9bce8258/go.mod h1:+Jpnv+LXE6dXu2xDcMzMc0RxRGuCPAoFxq5tJ/X6QpQ=
5-
github.com/chef/chef-server/docs-chef-io v0.0.0-20250303143005-18808e167759 h1:vv1u9/sudmHQz20oyPzXHouPE57ZVPofKWkBVvg7GMA=
6-
github.com/chef/chef-server/docs-chef-io v0.0.0-20250303143005-18808e167759/go.mod h1:gMSa25GUHmLimA0gjvRd3hs1buOBqkKPrdHzHvaJauY=
5+
github.com/chef/chef-server/docs-chef-io v0.0.0-20250414141619-a0fb7ff68e94 h1:YpF+MQ2CQ0V/sOtGrTCxa+Lpd5J9iR6ADDkrdSMqtw0=
6+
github.com/chef/chef-server/docs-chef-io v0.0.0-20250414141619-a0fb7ff68e94/go.mod h1:gMSa25GUHmLimA0gjvRd3hs1buOBqkKPrdHzHvaJauY=
77
github.com/chef/chef-workstation/docs-chef-io v0.0.0-20250205062508-ee50345a4044 h1:9su2oorS/cjvdxUEBaTZBjiCS3WafkLgk6bwDNQ1SDk=
88
github.com/chef/chef-workstation/docs-chef-io v0.0.0-20250205062508-ee50345a4044/go.mod h1:u6KNpAJs9lTmRigxXsxX0dEywa5KLB40m1vbAalN0NI=
99
github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20250403124242-2087b16979ee h1:IXegzdAKZ900k9sPqTJYhNBMpiIQlK90hRzqAk4xsO4=

0 commit comments

Comments
 (0)