From fc140c9c3db6a845431d6b1abeb3933e19250444 Mon Sep 17 00:00:00 2001 From: kitchen-porter Date: Wed, 10 Jul 2024 14:02:11 +0000 Subject: [PATCH 1/2] Standardise files with files in sous-chefs/repo-management Signed-off-by: kitchen-porter --- CHANGELOG.md | 2 ++ kitchen.dokken.yml | 5 ----- kitchen.global.yml | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5164fa1e9..fc71450aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ This file is used to list changes made in each version of the apache2 cookbook. Standardise files with files in sous-chefs/repo-management +Standardise files with files in sous-chefs/repo-management + ## 9.3.2 - *2024-05-06* ## 9.3.1 - *2023-12-21* diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml index 1dfe62c8f..6ead9e8e7 100644 --- a/kitchen.dokken.yml +++ b/kitchen.dokken.yml @@ -22,11 +22,6 @@ platforms: image: dokken/amazonlinux-2023 pid_one_command: /usr/lib/systemd/systemd - - name: centos-stream-8 - driver: - image: dokken/centos-stream-8 - pid_one_command: /usr/lib/systemd/systemd - - name: centos-stream-9 driver: image: dokken/centos-stream-9 diff --git a/kitchen.global.yml b/kitchen.global.yml index 4396f11eb..1740e4614 100644 --- a/kitchen.global.yml +++ b/kitchen.global.yml @@ -18,7 +18,6 @@ platforms: - name: almalinux-8 - name: almalinux-9 - name: amazonlinux-2023 - - name: centos-stream-8 - name: centos-stream-9 - name: debian-11 - name: debian-12 From f0c9f63d96cb16eac5876d589f7988340b04ddc8 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Mon, 15 Jul 2024 12:24:56 -0500 Subject: [PATCH 2/2] Update resource_apache2_install.md --- documentation/resource_apache2_install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/resource_apache2_install.md b/documentation/resource_apache2_install.md index f95ecea89..a87814c2f 100644 --- a/documentation/resource_apache2_install.md +++ b/documentation/resource_apache2_install.md @@ -33,7 +33,7 @@ Installs apache2. | max_keep_alive_requests | Integer | `100` | MaxKeepAliveRequests | | | keep_alive_timeout | Integer | `5` | KeepAliveTimeout | | | access_file_name | String | `.htaccess` | Access filename | | -| envvars_additional_params | Hash | `{}` | Hash of additional environment variables to add to the envvars file | +| envvars_additional_params | Hash | `{}` | Hash of additional environment variables to add to the envvars file | | | sysconfig_additional_params | Hash | `{}` | Hash of additional sysconfig parameters to apply to the system | | | template_cookbook | String | `apache2` | Cookbook to source the apache2.conf template from | |