Merge branch 'main' into IanMadd-patch-1

chef · Jul 3, 2023 · fb9c344 · fb9c344
2 parents 3254b56 + 389da5d
commit fb9c344
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,33 +1,41 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.6.11 -->
-## [15.6.11](https://github.com/chef/chef-server/tree/15.6.11) (2023-05-22)
+<!-- latest_release 15.7.2 -->
+## [15.7.2](https://github.com/chef/chef-server/tree/15.7.2) (2023-06-21)
 
 #### Merged Pull Requests
-- Add el-9 builder and tester to the pipelines [#3661](https://github.com/chef/chef-server/pull/3661) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
+- Docs update [#3676](https://github.com/chef/chef-server/pull/3676) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
 <!-- latest_release -->
 
-<!-- release_rollup since=15.6.2 -->
-### Changes since 15.6.2 release
+<!-- release_rollup since=15.7.0 -->
+### Changes since 15.7.0 release
 
 #### Merged Pull Requests
-- Add el-9 builder and tester to the pipelines [#3661](https://github.com/chef/chef-server/pull/3661) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit)) <!-- 15.6.11 -->
-- Bump omnibus-software from `6a1c889` to `67a1705` in /omnibus [#3660](https://github.com/chef/chef-server/pull/3660) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.6.10 -->
-- Bump nokogiri from 1.14.2 to 1.14.3 in /src/oc-id [#3643](https://github.com/chef/chef-server/pull/3643) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.6.9 -->
-- Update release process docs [#3631](https://github.com/chef/chef-server/pull/3631) ([lbakerchef](https://github.com/lbakerchef)) <!-- 15.6.8 -->
-- Bump pg from 1.4.5 to 1.4.6 in /src/chef-server-ctl [#3612](https://github.com/chef/chef-server/pull/3612) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.6.7 -->
-- Bump nokogiri from 1.14.0 to 1.14.2 in /src/oc-id [#3602](https://github.com/chef/chef-server/pull/3602) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.6.6 -->
-- Bump mixlib-install from 3.12.24 to 3.12.27 in /src/chef-server-ctl [#3591](https://github.com/chef/chef-server/pull/3591) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.6.5 -->
-- Bump activesupport from 7.0.4.1 to 7.0.4.2 in /oc-chef-pedant [#3588](https://github.com/chef/chef-server/pull/3588) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.6.4 -->
-- Integrating with sonarcubes [#3628](https://github.com/chef/chef-server/pull/3628) ([vinay-satish](https://github.com/vinay-satish)) <!-- 15.6.3 -->
+- Docs update [#3676](https://github.com/chef/chef-server/pull/3676) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit)) <!-- 15.7.2 -->
+- Update supported platforms page [#3675](https://github.com/chef/chef-server/pull/3675) ([IanMadd](https://github.com/IanMadd)) <!-- 15.7.1 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [15.7.0](https://github.com/chef/chef-server/tree/15.7.0) (2023-06-14)
+
+#### Merged Pull Requests
+- Integrating with sonarcubes [#3628](https://github.com/chef/chef-server/pull/3628) ([vinay-satish](https://github.com/vinay-satish))
+- Bump activesupport from 7.0.4.1 to 7.0.4.2 in /oc-chef-pedant [#3588](https://github.com/chef/chef-server/pull/3588) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump mixlib-install from 3.12.24 to 3.12.27 in /src/chef-server-ctl [#3591](https://github.com/chef/chef-server/pull/3591) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump nokogiri from 1.14.0 to 1.14.2 in /src/oc-id [#3602](https://github.com/chef/chef-server/pull/3602) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump pg from 1.4.5 to 1.4.6 in /src/chef-server-ctl [#3612](https://github.com/chef/chef-server/pull/3612) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Update release process docs [#3631](https://github.com/chef/chef-server/pull/3631) ([lbakerchef](https://github.com/lbakerchef))
+- Bump nokogiri from 1.14.2 to 1.14.3 in /src/oc-id [#3643](https://github.com/chef/chef-server/pull/3643) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump omnibus-software from `6a1c889` to `67a1705` in /omnibus [#3660](https://github.com/chef/chef-server/pull/3660) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Add el-9 builder and tester to the pipelines [#3661](https://github.com/chef/chef-server/pull/3661) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
+- Updated license scout issues [#3666](https://github.com/chef/chef-server/pull/3666) ([jashaik](https://github.com/jashaik))
+- Setting file and template backup to false for the config files [#3659](https://github.com/chef/chef-server/pull/3659) ([vinay-satish](https://github.com/vinay-satish))
+<!-- latest_stable_release -->
+
 ## [15.6.2](https://github.com/chef/chef-server/tree/15.6.2) (2023-03-17)
 
 #### Merged Pull Requests
 - Update default OpenJRE to 11.0.18+10 [#3623](https://github.com/chef/chef-server/pull/3623) ([lbakerchef](https://github.com/lbakerchef))
-<!-- latest_stable_release -->
 
 ## [15.6.1](https://github.com/chef/chef-server/tree/15.6.1) (2023-03-07)
 

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
@@ -32,6 +32,10 @@ In order to release, you will need the following accounts/permissions:
 Upgrade Erlang dependencies via automated script. 
 See https://github.com/chef/chef-server/blob/main/dev-docs/FrequentTasks.md#updating-erlang-dependencies-using-rebar3 .
 
+### Update documentation
+
+Ensure documentation in [docs-site](https://docs.chef.io/) is updated for changes that would be included in the release.
+
 ### Update Release Notes
 
 #### Pending Release Notes In Wiki

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-15.6.11
+15.7.2
diff --git a/docs-chef-io/layouts/shortcodes/chef-server/adopted_platforms_server.md b/docs-chef-io/layouts/shortcodes/chef-server/adopted_platforms_server.md
@@ -1,48 +1,10 @@
-The following table lists the commercially-supported platforms and versions for the Chef Infra Server:
+The following table lists the commercially-supported platforms for Chef Infra Server:
 
-<table>
-<colgroup>
-<col style="width: 56%" />
-<col style="width: 20%" />
-<col style="width: 24%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Platform</th>
-<th>Architecture</th>
-<th>Version</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Amazon Linux 2</td>
-<td><code>x86_64</code></td>
-<td><code>2.x</code></td>
-</tr>
-<tr>
-<td>CentOS</td>
-<td><code>x86_64</code></td>
-<td><code>7.x</code>, <code>8.x</code></td>
-</tr>
-<tr>
-<td>Oracle Enterprise Linux</td>
-<td><code>x86_64</code></td>
-<td><code>7.x</code>, <code>8.x</code></td>
-</tr>
-<tr>
-<td>Red Hat Enterprise Linux</td>
-<td><code>x86_64</code></td>
-<td><code>7.x</code>, <code>8.x</code></td>
-</tr>
-<tr>
-<td>SUSE Linux Enterprise Server</td>
-<td><code>x86_64</code></td>
-<td><code>12.x</code>, <code>15.x</code></td>
-</tr>
-<tr>
-<td>Ubuntu</td>
-<td><code>x86_64</code></td>
-<td><code>16.04</code>, <code>18.04</code>, <code>20.04</code></td>
-</tr>
-</tbody>
-</table>
+| Platform | Architecture | Version |
+|------------------------------|--------------|-------------------------------------|
+| Amazon Linux 2 | `x86_64` | `2.x` |
+| CentOS | `x86_64` | `7.x`, `8.x` |
+| Oracle Enterprise Linux | `x86_64` | `7.x`, `8.x` |
+| Red Hat Enterprise Linux | `x86_64` | `7.x`, `8.x`, `9.x` |
+| SUSE Linux Enterprise Server | `x86_64` | `12.x`, `15.x` |
+| Ubuntu | `x86_64` | `16.04`, `18.04`, `20.04`, `22.04` |
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
  tomlrb (>= 1.2, < 3.0)
  tty-box (~> 0.6)
  tty-prompt (~> 0.20)
- license_scout (1.3.5)
+ license_scout (1.3.6)
  ffi-yajl (~> 2.2)
  mixlib-shellout (>= 2.2, < 4.0)
  toml-rb (>= 1, < 3)

diff --git a/omnibus/files/server-ctl-cookbooks/infra-server/recipes/fix_permissions.rb b/omnibus/files/server-ctl-cookbooks/infra-server/recipes/fix_permissions.rb
@@ -24,3 +24,18 @@
 execute "find #{GEM_PATH} -perm /u=r,g=r,o=r ! -perm /u=x -exec chmod 644 {} \\;" do
  user 'root'
 end
+
+# We backup the files and templates in the folder /var/opt/opscode/local-mode-cache/backup
+# the default vaule for the file and template resource is 5 i.e, there will be upto 5 backups of the
+# files and templates that we use in the server-ctl cookbook. This includes the configs files also.
+# To stop taking the backup, we need to explicitly mention the property backup as 'false' in all the
+# usage of file and template resource in the server-ctl cookbook.
+# We can secure the backups by changing the permission of /var/opt/opscode/local-mode-cache/backup
+# to read and write only for the root user. (CVE-2023-28864)
+
+directory "/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/local-mode-cache/backup" do
+ owner 'root'
+ group 'root'
+ mode '600'
+ recursive false
+end