Skip to content

Commit

Permalink
Merge branch 'main' into oc-id_uplift
Browse files Browse the repository at this point in the history
  • Loading branch information
RoyShravani authored Jun 22, 2023
2 parents 2381902 + 389da5d commit 098cb3b
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 76 deletions.
2 changes: 2 additions & 0 deletions .expeditor/release.omnibus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ builder-to-testers-map:
- ubuntu-22.04-x86_64
el-8-x86_64:
- el-8-x86_64
el-9-x86_64:
- el-9-x86_64
36 changes: 23 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
# Chef Server Changelog
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
<!-- latest_release 15.6.9 -->
## [15.6.9](https://github.com/chef/chef-server/tree/15.6.9) (2023-04-14)
<!-- latest_release 15.7.2 -->
## [15.7.2](https://github.com/chef/chef-server/tree/15.7.2) (2023-06-21)

#### Merged Pull Requests
- 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]))
- 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
- 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)

Expand Down
4 changes: 4 additions & 0 deletions RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.6.9
15.7.2
Original file line number Diff line number Diff line change
@@ -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` |
30 changes: 15 additions & 15 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 6a1c8896edf6c5606facc83b75ecaacf22019e2b
revision: 67a1705bfa8731ba4eac7b5e62f340d5f08a2952
branch: main
specs:
omnibus-software (23.3.287)
omnibus-software (23.5.290)
omnibus (>= 9.0.0)

GIT
Expand All @@ -29,18 +29,18 @@ GIT
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
aws-partitions (1.703.0)
aws-sdk-core (3.170.0)
aws-partitions (1.765.0)
aws-sdk-core (3.172.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.62.0)
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.116.0)
Expand Down Expand Up @@ -122,7 +122,7 @@ GEM
citrus (3.0.2)
cleanroom (1.0.0)
coderay (1.1.3)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
contracts (0.16.1)
corefoundation (0.3.13)
ffi (>= 1.15.0)
Expand Down Expand Up @@ -182,7 +182,7 @@ GEM
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
iostruct (0.0.4)
iostruct (0.0.5)
ipaddress (0.8.3)
jmespath (1.6.2)
json (2.6.3)
Expand All @@ -192,7 +192,7 @@ GEM
tomlrb (>= 1.2, < 3.0)
tty-box (~> 0.6)
tty-prompt (~> 0.20)
license_scout (1.3.4)
license_scout (1.3.6)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
Expand Down Expand Up @@ -223,14 +223,14 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (7.0.1)
net-ssh (7.1.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nori (2.6.0)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (17.9.0)
ohai (17.9.1)
chef-config (>= 14.12, < 18)
chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
Expand All @@ -247,13 +247,13 @@ GEM
parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
pedump (0.6.5)
pedump (0.6.6)
awesome_print
iostruct (>= 0.0.4)
multipart-post (>= 2.0.0)
rainbow
zhexdump (>= 0.0.2)
plist (3.6.0)
plist (3.7.0)
proxifier (1.0.3)
pry (0.14.2)
coderay (~> 1.1)
Expand All @@ -280,7 +280,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.1)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
rubyzip (2.3.2)
Expand Down Expand Up @@ -312,7 +312,7 @@ GEM
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
thor (1.2.1)
thor (1.2.2)
toml-rb (2.2.0)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 098cb3b

Please sign in to comment.