From 16172c246880b0b2a4491d37d90e1258c23bb0f8 Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Tue, 19 Mar 2024 11:35:17 -0400 Subject: [PATCH 1/3] Update platforms.md (#4253) Signed-off-by: Ian Maddaus --- content/platforms.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/content/platforms.md b/content/platforms.md index 792ad3cefb7..54c7fd444c5 100644 --- a/content/platforms.md +++ b/content/platforms.md @@ -21,19 +21,19 @@ support, see the [Supported Versions](/versions/) page. We offer two levels of support for platforms (operating systems), [Commercial Support]({{< relref "#commercial-support">}}) and [Community Support]({{< relref "#community-support" >}}). -### Commercial Support +### Commercial support Commercial support for platforms is part of paid maintenance contracts with Chef Software. Support contracts allow you to open tickets and receive service level agreement (SLA) assistance from our support desk. Commercially supported platforms are extensively tested as part of Chef's development and release process. Commercial support follows the lifecycle of the underlying operating system vendor. Commercial support is limited to the platforms listed in the "Commercial Support" tables--platforms not listed in these tables are unsupported. -### Community Support +### Community support Community support for platforms means that members of the Chef community have contributed to these platforms and Chef doesn't actively work to maintain this functionality. Chef doesn't explicitly test community supported platforms as part of the development and release process. Many of these platforms are forks, clones, or otherwise derivative of platforms that Chef commercially supports. Continued functionality for these platforms is likely, but not guaranteed. Unsupported platforms may have missing or non-operative functionality. As always, we welcome community contributions from anyone looking to expand community support for platforms in Chef products. -### Support for Derived Platforms +### Support for derived platforms Chef doesn't explicitly test or provide builds for derived distributions other than those in our supported platform list. However, if the derived distribution is a direct rebuild of the originating distribution and hasn't diverged in functionality or packaged dependencies, Chef will support our customers through our normal channels. @@ -43,7 +43,7 @@ The sections below list the platforms that Chef Software supports. ### Chef Automate -#### Commercial Support +#### Commercial support Commercial support for the [Chef Automate](/automate/system_requirements/) is available for platforms that use: @@ -54,14 +54,14 @@ Commercial support for the [Chef Automate](/automate/system_requirements/) is av ### Chef Automate HA -#### Commercial Support +#### Commercial support See the [Chef Automate HA supported platforms](/automate/ha_on_premises_deployment_prerequisites/#software-requirements) documentation for a list of supported platforms for Chef Automate HA. ### Chef Backend -#### Commercial Support +#### Commercial support The following table lists the commercially supported platforms for Chef Backend, which is the high-availability solution for Chef Infra Server. @@ -86,7 +86,7 @@ See our policy on [support for derived platforms](#support-for-derived-platforms ### Chef Infra Client -#### Commercial Support +#### Commercial support The following table lists the commercially supported platforms and versions for Chef Infra Client. @@ -116,7 +116,7 @@ See our policy on [support for derived platforms](#support-for-derived-platforms | --- | --- | --- | --- | | AlmaLinux | `x86_64`, `aarch64` | `8.x` | CentOS | -#### Community Support +#### Community support The following platforms are supported only using the community. @@ -144,13 +144,13 @@ The following platforms are supported only using the community. ### Chef Infra Server -#### Commercial Support +#### Commercial support {{< readfile file="content/server/reusable/md/adopted_platforms_server.md" >}} ### Chef InSpec -#### Commercial Support +#### Commercial support The following table lists the commercially supported platforms and versions for Chef InSpec. @@ -166,7 +166,7 @@ See our policy on [support for derived platforms](#support-for-derived-platforms ### Chef Manage -#### Commercial Support +#### Commercial support The following table lists the commercially supported platforms for Chef Manage. @@ -190,7 +190,7 @@ See our policy on [support for derived platforms](#support-for-derived-platforms ### Chef Workstation -#### Commercial Support +#### Commercial support The following table lists the commercially supported platforms and versions for the Chef Workstation. @@ -204,9 +204,9 @@ See our policy on [support for derived platforms](#support-for-derived-platforms {{< readfile file = "content/workstation/reusable/md/workstation_supported_derived_platforms.md" >}} -## Platform End-of-Life Policy +## Platform end-of-life policy -Chef's products on particular platforms and versions reach end-of-life on the same date as the vendor EOL milestone for that operating systems. +Chef's products on particular platforms and versions reach end-of-life on the same date as the vendor EOL milestone for that operating system. Because different vendors use different terminology, the following table clarifies when Chef products are end-of-life according to those vendors' terms. | Platform | Vendor End-of-Life | From 8bec439e3bd956a921c0a2e66778ec164abae4f2 Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Wed, 20 Mar 2024 15:21:01 -0400 Subject: [PATCH 2/3] Update server docs (#4254) Signed-off-by: Ian Maddaus --- .../server/config_rb_server_optional_settings.md | 10 +++++++++- .../server/reusable/md/adopted_platforms_server.md | 9 +++++---- _vendor/modules.txt | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/config_rb_server_optional_settings.md b/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/config_rb_server_optional_settings.md index fa1370287e0..310c6217b9c 100644 --- a/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/config_rb_server_optional_settings.md +++ b/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/config_rb_server_optional_settings.md @@ -1459,7 +1459,15 @@ This configuration file has the following settings for `oc-id`: Default value: `false`. - **New in Chef Infra Server 15.9.19** + **New in Chef Infra Server 15.9.20** + +`oc_id['onetrust_id']` + +: The OneTrust data domain script ID for Chef Infra. You must also set `oc_id['enable_onetrust']` to `true`. + + Default value: `nil`. + + **New in Chef Infra Server 15.9.27** `oc_id['log_directory']` diff --git a/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/reusable/md/adopted_platforms_server.md b/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/reusable/md/adopted_platforms_server.md index e1f5ae09feb..3206ceb0f2f 100644 --- a/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/reusable/md/adopted_platforms_server.md +++ b/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/reusable/md/adopted_platforms_server.md @@ -1,10 +1,11 @@ -The following table lists the commercially-supported platforms for Chef Infra Server: +The following table lists the commercially supported platforms for Chef Infra Server: | Platform | Architecture | Version | |------------------------------|--------------|-------------------------------------| -| Amazon Linux 2 | `x86_64` | `2.x` | -| CentOS | `x86_64` | `7.x`, `8.x` | +| Amazon Linux | `x86_64` | `2.x`, `2023` | +| CentOS | `x86_64` | `7.x` | | Oracle Enterprise Linux | `x86_64` | `7.x`, `8.x` | | Red Hat Enterprise Linux | `x86_64` | `7.x`, `8.x`, `9.x` | +| Rocky Linux | `x86_64` | `9.x` | | SUSE Linux Enterprise Server | `x86_64` | `12.x`, `15.x` | -| Ubuntu | `x86_64` | `16.04`, `18.04`, `20.04`, `22.04` | +| Ubuntu | `x86_64` | `20.04`, `22.04` | diff --git a/_vendor/modules.txt b/_vendor/modules.txt index a043024a555..a400655c99f 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/chef/automate/components/docs-chef-io v0.0.0-20240306133449-4e982f867599 # github.com/chef/desktop-config/docs-chef-io v0.0.0-20230711052355-bad26ce3ac0b # github.com/habitat-sh/habitat/components/docs-chef-io v0.0.0-20230808222519-d0c20bbe8c45 -# github.com/chef/chef-server/docs-chef-io v0.0.0-20240110155437-6cd481103560 +# github.com/chef/chef-server/docs-chef-io v0.0.0-20240320162132-10d96e306f90 # github.com/inspec/inspec/docs-chef-io v0.0.0-20240129132650-42c7f3e46b43 # github.com/inspec/inspec-alicloud/docs-chef-io v0.0.0-20240122032124-a1d2a214e170 # github.com/inspec/inspec-aws/docs-chef-io v0.0.0-20240122032232-049dcf822eef diff --git a/go.mod b/go.mod index a934a55dee8..b3cd6c1ca81 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/chef/automate/components/docs-chef-io v0.0.0-20240306133449-4e982f867599 // indirect - github.com/chef/chef-server/docs-chef-io v0.0.0-20240110155437-6cd481103560 // indirect + github.com/chef/chef-server/docs-chef-io v0.0.0-20240320162132-10d96e306f90 // indirect github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240220152040-faf51299a28a // indirect github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20240306070238-713aa7a8dd8e // indirect github.com/chef/compliance-remediation-2022/docs-chef-io v0.0.0-20240313054833-ebbc45209efa // indirect diff --git a/go.sum b/go.sum index b0b4badfbbe..a7b3c8d0b06 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chef/automate/components/docs-chef-io v0.0.0-20240306133449-4e982f867599 h1:vya+2EqafWQi5osINw4CRrmoDNfZ3LJjrAplqpMc7eA= github.com/chef/automate/components/docs-chef-io v0.0.0-20240306133449-4e982f867599/go.mod h1:juvLC7Rt33YOCgJ5nnfl4rWZRAbSwqjTbWmcAoA0LtU= -github.com/chef/chef-server/docs-chef-io v0.0.0-20240110155437-6cd481103560 h1:1fbTdNlat08FZ9xTSEnyBmTFrVj1O75bwo3x6Iaab40= -github.com/chef/chef-server/docs-chef-io v0.0.0-20240110155437-6cd481103560/go.mod h1:gMSa25GUHmLimA0gjvRd3hs1buOBqkKPrdHzHvaJauY= +github.com/chef/chef-server/docs-chef-io v0.0.0-20240320162132-10d96e306f90 h1:zXtajiExlaLQc9d0KVJb5PLNBwcr2GyKixpKeYe2v4M= +github.com/chef/chef-server/docs-chef-io v0.0.0-20240320162132-10d96e306f90/go.mod h1:gMSa25GUHmLimA0gjvRd3hs1buOBqkKPrdHzHvaJauY= github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240220152040-faf51299a28a h1:76ZYfDXaaPCMi4YQ4uuhKSUALF488ZNfAcJx9/p+7/I= github.com/chef/chef-workstation/docs-chef-io v0.0.0-20240220152040-faf51299a28a/go.mod h1:gvoh6ov1YU98CVzBEWzEZeCLTRunfQ6r1VO7M3LFE9U= github.com/chef/compliance-profiles/docs-chef-io v0.0.0-20240306070238-713aa7a8dd8e h1:Q8vzrhpm7okiekLTx2rQ44gsliLVk4ahBon662KeRQI= From 99e0b590416109b6a538515558168a8e76bc1275 Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Thu, 21 Mar 2024 16:30:16 -0400 Subject: [PATCH 3/3] update gitignore (#4256) Signed-off-by: Ian Maddaus --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index e3850cf3be7..8e0e690db21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ .DS_Store +# Hugo/Go workspace files +*.work +*.work.sum + # ignore doctree files in translation folders *.doctree *.pickle @@ -26,6 +30,9 @@ static/fonts/fontawesome node_modules vendor +# dart-sass files for local dev testing +/dart-sass + # temp file created by hugo .hugo_build.lock