Disable journal dump on fail

Too noisy.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

.github/workflows/kitchen.vagrant.yml

@@ -17,11 +17,11 @@ jobs:
           # - default-freebsd-130-master-py3
           # - modules-freebsd-130-master-py3
           - freebsd-130-master-py3
-          # - default-freebsd-122-master-py3
+          # - default-freebsd-123-master-py3
-          # - modules-freebsd-122-master-py3
+          # - modules-freebsd-123-master-py3
-          - freebsd-122-master-py3
+          - freebsd-123-master-py3
-          # - default-freebsd-130-3003-1-py3
+          # - default-freebsd-130-3004-0-py3
-          # - default-freebsd-122-3003-1-py3
+          # - default-freebsd-123-3004-0-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

.gitlab-ci.yml

@@ -103,7 +103,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
   stage: *stage_test
   image: *image_dindruby
   services: *services_docker_dind
@@ -118,18 +118,27 @@ rubocop:
     # Alternative value to consider: `${CI_JOB_NAME}`
     - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
 
+###############################################################################
+# Define `test` template (`allow_failure: true`)
+###############################################################################
+.test_instance_failure_permitted:
+  <<: *test_instance
+  allow_failure: true
+
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
+# yamllint disable rule:line-length
 # default-debian-11-tiamat-py3: {extends: '.test_instance'}
 # default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# default-centos-8-tiamat-py3: {extends: '.test_instance'}
+# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@@ -145,33 +154,33 @@ debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
 # modules-debian-9-master-py3: {extends: '.test_instance'}
 # debian-9-master-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+# modules-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # modules-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # modules-ubuntu-1804-master-py3: {extends: '.test_instance'}
 ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-centos-8-master-py3: {extends: '.test_instance'}
+# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-# modules-centos-8-master-py3: {extends: '.test_instance'}
+# modules-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-centos-8-master-py3: {extends: '.test_instance'}
+centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # modules-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
-# default-fedora-34-master-py3: {extends: '.test_instance'}
+# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-# modules-fedora-34-master-py3: {extends: '.test_instance'}
+# modules-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-fedora-34-master-py3: {extends: '.test_instance'}
+fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-33-master-py3: {extends: '.test_instance'}
+# default-fedora-35-master-py3: {extends: '.test_instance'}
-# modules-fedora-33-master-py3: {extends: '.test_instance'}
+# modules-fedora-35-master-py3: {extends: '.test_instance'}
-fedora-33-master-py3: {extends: '.test_instance'}
+fedora-35-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # modules-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 opensuse-leap-153-master-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-# modules-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# modules-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-# modules-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # https://community.letsencrypt.org/t/localhost-crt-does-not-exist-or-is-empty/103979
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # modules-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -197,60 +206,37 @@ almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # modules-rockylinux-8-master-py3: {extends: '.test_instance'}
 rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3003-3-py3: {extends: '.test_instance'}
+# default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3003-3-py3: {extends: '.test_instance'}
+# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-debian-9-3003-3-py3: {extends: '.test_instance'}
+# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-centos-8-3003-3-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-# default-centos-7-3003-3-py3: {extends: '.test_instance'}
+# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
+# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
+# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
+# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
+# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-debian-11-3002-7-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-debian-10-3002-7-py3: {extends: '.test_instance'}
+# default-debian-10-3003-4-py3: {extends: '.test_instance'}
-# default-debian-9-3002-7-py3: {extends: '.test_instance'}
+# default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-centos-8-3002-7-py3: {extends: '.test_instance'}
+# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3002-7-py3: {extends: '.test_instance'}
+# default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
+# yamllint enable rule:line-length
-# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
-# default-debian-10-3001-8-py3: {extends: '.test_instance'}
-# default-debian-9-3001-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
-# default-centos-8-3001-8-py3: {extends: '.test_instance'}
-# default-centos-7-3001-8-py3: {extends: '.test_instance'}
-# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

.pre-commit-config.yaml

@@ -3,6 +3,18 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+ci:
+  autofix_commit_msg: |
+    ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
+
+    For more information, see https://pre-commit.ci
+  autofix_prs: true
+  autoupdate_branch: ''
+  autoupdate_commit_msg: |
+    ci(pre-commit.ci): perform `pre-commit` autoupdate
+  autoupdate_schedule: quarterly
+  skip: []
+  submodules: false
 default_stages: [commit]
 repos:
   - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -18,7 +30,7 @@ repos:
         additional_dependencies: ['@commitlint/config-conventional@8.3.4']
         always_run: true
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.9.1
+    rev: v1.30.1
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -26,14 +38,14 @@ repos:
         always_run: true
         pass_filenames: false
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.7.1.1
+    rev: v0.8.0.4
     hooks:
       - id: shellcheck
         name: Check shell scripts with shellcheck
         files: ^.*\.(sh|bash|ksh)$
         types: []
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.23.0
+    rev: v1.26.3
     hooks:
       - id: yamllint
         name: Check YAML syntax with yamllint
@@ -41,7 +53,7 @@ repos:
         always_run: true
         pass_filenames: false
   - repo: https://github.com/warpnet/salt-lint
-    rev: v0.3.0
+    rev: v0.8.0
     hooks:
       - id: salt-lint
         name: Check Salt files using salt-lint

.rubocop.yml

@@ -16,4 +16,8 @@ Security/YAMLLoad:
   Exclude:
     - test/integration/**/_mapdata.rb
 
+# General settings across all cops in this formula
+AllCops:
+  NewCops: enable
+
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`

.travis.yml

@@ -86,9 +86,10 @@ jobs:
     # - env: INSTANCE=default-debian-11-tiamat-py3
     # - env: INSTANCE=default-debian-10-tiamat-py3
     # - env: INSTANCE=default-debian-9-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-2204-tiamat-py3
     # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=default-centos-8-tiamat-py3
+    # - env: INSTANCE=default-centos-stream8-tiamat-py3
     # - env: INSTANCE=default-centos-7-tiamat-py3
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
@@ -104,30 +105,30 @@ jobs:
     # - env: INSTANCE=default-debian-9-master-py3
     # - env: INSTANCE=modules-debian-9-master-py3
     # - env: INSTANCE=debian-9-master-py3
+    # - env: INSTANCE=default-ubuntu-2204-master-py3
+    # - env: INSTANCE=modules-ubuntu-2204-master-py3
+    - env: INSTANCE=ubuntu-2204-master-py3
     # - env: INSTANCE=default-ubuntu-2004-master-py3
     # - env: INSTANCE=modules-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-2004-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     # - env: INSTANCE=modules-ubuntu-1804-master-py3
     - env: INSTANCE=ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
+    # - env: INSTANCE=default-centos-stream8-master-py3
-    # - env: INSTANCE=modules-centos-8-master-py3
+    # - env: INSTANCE=modules-centos-stream8-master-py3
-    - env: INSTANCE=centos-8-master-py3
+    - env: INSTANCE=centos-stream8-master-py3
     # - env: INSTANCE=default-centos-7-master-py3
     # - env: INSTANCE=modules-centos-7-master-py3
     - env: INSTANCE=centos-7-master-py3
-    # - env: INSTANCE=default-fedora-34-master-py3
+    # - env: INSTANCE=default-fedora-36-master-py3
-    # - env: INSTANCE=modules-fedora-34-master-py3
+    # - env: INSTANCE=modules-fedora-36-master-py3
-    - env: INSTANCE=fedora-34-master-py3
+    - env: INSTANCE=fedora-36-master-py3
-    # - env: INSTANCE=default-fedora-33-master-py3
+    # - env: INSTANCE=default-fedora-35-master-py3
-    # - env: INSTANCE=modules-fedora-33-master-py3
+    # - env: INSTANCE=modules-fedora-35-master-py3
-    - env: INSTANCE=fedora-33-master-py3
+    - env: INSTANCE=fedora-35-master-py3
     # - env: INSTANCE=default-opensuse-leap-153-master-py3
     # - env: INSTANCE=modules-opensuse-leap-153-master-py3
     - env: INSTANCE=opensuse-leap-153-master-py3
-    # - env: INSTANCE=default-opensuse-leap-152-master-py3
-    # - env: INSTANCE=modules-opensuse-leap-152-master-py3
-    - env: INSTANCE=opensuse-leap-152-master-py3
     - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=modules-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=opensuse-tmbl-latest-master-py3
@@ -156,60 +157,36 @@ jobs:
     # - env: INSTANCE=default-rockylinux-8-master-py3
     # - env: INSTANCE=modules-rockylinux-8-master-py3
     - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=default-debian-11-3003-3-py3
+    # - env: INSTANCE=default-debian-11-3004-1-py3
-    # - env: INSTANCE=default-debian-10-3003-3-py3
+    # - env: INSTANCE=default-debian-10-3004-1-py3
-    # - env: INSTANCE=default-debian-9-3003-3-py3
+    # - env: INSTANCE=default-debian-9-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-3-py3
+    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=default-centos-8-3003-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
-    # - env: INSTANCE=default-centos-7-3003-3-py3
+    # - env: INSTANCE=default-centos-stream8-3004-1-py3
-    # - env: INSTANCE=default-fedora-34-3003-3-py3
+    # - env: INSTANCE=default-centos-7-3004-1-py3
-    # - env: INSTANCE=default-fedora-33-3003-3-py3
+    # - env: INSTANCE=default-fedora-36-3004-1-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
+    # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
+    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
+    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-3-py3
+    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-3-py3
+    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-3-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
-    # - env: INSTANCE=default-arch-base-latest-3003-3-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
+    # - env: INSTANCE=default-almalinux-8-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
+    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
-    # - env: INSTANCE=default-almalinux-8-3003-3-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-debian-11-3002-7-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=default-debian-10-3002-7-py3
+    # - env: INSTANCE=default-debian-10-3003-4-py3
-    # - env: INSTANCE=default-debian-9-3002-7-py3
+    # - env: INSTANCE=default-debian-9-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-7-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=default-centos-8-3002-7-py3
+    # - env: INSTANCE=default-centos-stream8-3003-4-py3
-    # - env: INSTANCE=default-centos-7-3002-7-py3
+    # - env: INSTANCE=default-centos-7-3003-4-py3
-    # - env: INSTANCE=default-fedora-34-3002-7-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=default-fedora-33-3002-7-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
+    # - env: INSTANCE=default-almalinux-8-3003-4-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-7-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-7-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-7-py3
-    # - env: INSTANCE=default-arch-base-latest-3002-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
-    # - env: INSTANCE=default-debian-10-3001-8-py3
-    # - env: INSTANCE=default-debian-9-3001-8-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-8-py3
-    # - env: INSTANCE=default-centos-8-3001-8-py3
-    # - env: INSTANCE=default-centos-7-3001-8-py3
-    # - env: INSTANCE=default-fedora-34-3001-8-py3
-    # - env: INSTANCE=default-fedora-33-3001-8-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-8-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

AUTHORS.md

@@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|145
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|147
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|40
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|36
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|32
@@ -87,6 +87,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/326786?v=4' width='36' height='36' alt='@wido'>|[@wido](https://github.com/wido)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9978732?v=4' width='36' height='36' alt='@abehling'>|[@abehling](https://github.com/abehling)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1021809?v=4' width='36' height='36' alt='@ardin'>|[@ardin](https://github.com/ardin)|1
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/45118187?v=4' width='36' height='36' alt='@l00d3r'>|[@l00d3r](https://github.com/l00d3r)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17029228?v=4' width='36' height='36' alt='@mcarlton00'>|[@mcarlton00](https://github.com/mcarlton00)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>|[@mschiff](https://github.com/mschiff)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2869?v=4' width='36' height='36' alt='@nigelsim'>|[@nigelsim](https://github.com/nigelsim)|1
@@ -97,4 +98,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-10-20.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-10-28.

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.2](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.1...v1.2.2) (2021-10-28)
+
+
+### Bug Fixes
+
+* **redhat:** use correct vhostdir, sitesdir and logrotate script for redhat family ([#376](https://github.com/saltstack-formulas/apache-formula/issues/376)) ([c4b8538](https://github.com/saltstack-formulas/apache-formula/commit/c4b85381288ae878207ffa5d2cc36cabc916e8f1))
+
 ## [1.2.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1) (2021-10-20)
 
 

CODEOWNERS

@@ -22,6 +22,7 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
+/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf

FORMULA

@@ -1,7 +1,7 @@
 name: apache
 os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD
 os_family: RedHat, Debian, Suse, FreeBSD
-version: 1.2.1
+version: 1.2.2
 release: 1
 minimum_version: 2015.8
 summary: Formula for installing Apache

Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
 
 # Install the `inspec` gem using `git` because versions after `4.22.22`
 # suppress diff output; this version fixes this for our uses.
@@ -16,7 +16,7 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
 # rubocop:enable Layout/LineLength
 
 gem 'kitchen-inspec', '>= 2.5.0'
-gem 'kitchen-salt', '>= 0.6.3'
+gem 'kitchen-salt', '>= 0.7.2'
 
 group :vagrant do
   gem 'kitchen-vagrant'

Gemfile.lock

@@ -1,17 +1,20 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 49969f894d2fa89189ce80401338bcbec66cba93
+  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
   branch: ssf
   specs:
-    inspec (4.47.3)
+    inspec (5.18.15)
+      cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 4.47.3)
+      inspec-core (= 5.18.15)
       mongo (= 2.13.2)
-      train (~> 3.0)
+      progress_bar (~> 1.3.3)
+      rake
+      train (~> 3.10)
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (4.47.3)
+    inspec-core (5.18.15)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -24,55 +27,55 @@ GIT
       parallel (~> 1.9)
       parslet (>= 1.5, < 2.0)
       pry (~> 0.13)
-      rspec (>= 3.9, < 3.11)
+      rspec (>= 3.9, <= 3.11)
       rspec-its (~> 1.2)
       rubyzip (>= 1.2.2, < 3.0)
       semverse (~> 3.0)
       sslshake (~> 1.2)
       thor (>= 0.20, < 2.0)
       tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
+      train-core (~> 3.10)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
 
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c
+  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
   branch: ssf
   specs:
-    kitchen-docker (2.11.0)
+    kitchen-docker (2.12.0)
       test-kitchen (>= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.513.0)
+    aws-partitions (1.607.0)
-    aws-sdk-alexaforbusiness (1.50.0)
+    aws-sdk-alexaforbusiness (1.56.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-amplify (1.32.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.67.0)
+    aws-sdk-apigateway (1.78.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.36.0)
+    aws-sdk-apigatewayv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-applicationautoscaling (1.51.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.41.0)
+    aws-sdk-athena (1.55.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-autoscaling (1.63.0)
       aws-sdk-core (~> 3, >= 3.112.0)
@@ -80,41 +83,41 @@ GEM
     aws-sdk-batch (1.47.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.41.0)
+    aws-sdk-budgets (1.50.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.58.0)
+    aws-sdk-cloudformation (1.70.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.56.0)
+    aws-sdk-cloudfront (1.65.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.33.0)
+    aws-sdk-cloudhsm (1.39.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.36.0)
+    aws-sdk-cloudhsmv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.38.0)
+    aws-sdk-cloudtrail (1.49.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.55.0)
+    aws-sdk-cloudwatch (1.64.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatchevents (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.45.0)
+    aws-sdk-cloudwatchlogs (1.53.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.45.0)
+    aws-sdk-codecommit (1.51.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.43.0)
+    aws-sdk-codedeploy (1.49.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.47.0)
+    aws-sdk-codepipeline (1.53.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cognitoidentity (1.31.0)
       aws-sdk-core (~> 3, >= 3.112.0)
@@ -122,91 +125,94 @@ GEM
     aws-sdk-cognitoidentityprovider (1.53.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.66.0)
+    aws-sdk-configservice (1.79.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.121.1)
+    aws-sdk-core (3.131.2)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
+      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-costandusagereportservice (1.34.0)
+    aws-sdk-costandusagereportservice (1.40.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-databasemigrationservice (1.53.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.63.0)
+    aws-sdk-dynamodb (1.75.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.267.0)
+    aws-sdk-ec2 (1.322.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.47.0)
+    aws-sdk-ecr (1.56.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecrpublic (1.6.0)
+    aws-sdk-ecrpublic (1.12.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.85.0)
+    aws-sdk-ecs (1.100.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.45.0)
+    aws-sdk-efs (1.54.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.63.0)
+    aws-sdk-eks (1.75.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.62.0)
+    aws-sdk-elasticache (1.78.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.45.0)
+    aws-sdk-elasticbeanstalk (1.51.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.34.0)
+    aws-sdk-elasticloadbalancing (1.40.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.68.0)
+    aws-sdk-elasticloadbalancingv2 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.56.0)
+    aws-sdk-elasticsearchservice (1.65.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-emr (1.53.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-eventbridge (1.24.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.42.0)
+    aws-sdk-firehose (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-glue (1.88.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.48.0)
+    aws-sdk-guardduty (1.58.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.61.0)
+    aws-sdk-iam (1.69.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.41.0)
+    aws-sdk-kafka (1.50.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.35.0)
+    aws-sdk-kinesis (1.41.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.49.0)
+    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.69.0)
+    aws-sdk-lambda (1.84.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-mq (1.40.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-networkfirewall (1.8.0)
+    aws-sdk-networkfirewall (1.17.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.14.0)
+    aws-sdk-networkmanager (1.24.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-organizations (1.59.0)
       aws-sdk-core (~> 3, >= 3.112.0)
@@ -214,30 +220,33 @@ GEM
     aws-sdk-ram (1.26.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.127.0)
+    aws-sdk-rds (1.148.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.69.0)
+    aws-sdk-redshift (1.84.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.55.0)
+    aws-sdk-route53 (1.63.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.33.0)
+    aws-sdk-route53domains (1.40.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.30.0)
+    aws-sdk-route53resolver (1.37.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
+    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
+    aws-sdk-s3control (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
+      aws-sigv4 (~> 1.1)
     aws-sdk-secretsmanager (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.53.0)
+    aws-sdk-securityhub (1.67.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-servicecatalog (1.60.0)
       aws-sdk-core (~> 3, >= 3.112.0)
@@ -245,8 +254,8 @@ GEM
     aws-sdk-ses (1.41.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-shield (1.41.0)
+    aws-sdk-shield (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-signer (1.32.0)
       aws-sdk-core (~> 3, >= 3.120.0)
@@ -254,26 +263,32 @@ GEM
     aws-sdk-simpledb (1.29.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.32.0)
+    aws-sdk-sms (1.40.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.45.0)
+    aws-sdk-sns (1.53.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.44.0)
+    aws-sdk-sqs (1.51.1)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.119.0)
+    aws-sdk-ssm (1.137.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-states (1.39.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
+    aws-sdk-synthetics (1.19.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
+      aws-sigv4 (~> 1.1)
     aws-sdk-transfer (1.34.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
+    aws-sdk-waf (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv2 (1.1.0)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure_graph_rbac (0.17.2)
       ms_rest_azure (~> 0.12.0)
@@ -286,11 +301,11 @@ GEM
     azure_mgmt_storage (0.23.0)
       ms_rest_azure (~> 0.12.0)
     bcrypt_pbkdf (1.1.0)
-    bson (4.12.1)
+    bson (4.15.0)
     builder (3.2.4)
-    chef-config (17.6.18)
+    chef-config (17.10.0)
       addressable
-      chef-utils (= 17.6.18)
+      chef-utils (= 17.10.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -298,20 +313,22 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (17.6.18)
+    chef-utils (17.10.0)
       concurrent-ruby
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
+    cookstyle (7.32.1)
+      rubocop (= 1.25.1)
     declarative (0.0.20)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.2.4)
+    ed25519 (1.3.0)
     erubi (1.10.0)
-    excon (0.87.0)
+    excon (0.92.3)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -330,7 +347,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     fuzzyurl (0.9.0)
     google-api-client (0.52.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -350,26 +367,28 @@ GEM
       signet (~> 0.14)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashie (4.1.0)
-    http-cookie (1.0.4)
+    highline (2.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
-    json (2.5.1)
+    json (2.6.2)
-    jwt (2.3.0)
+    jwt (2.4.1)
-    kitchen-inspec (2.5.0)
+    kitchen-inspec (2.6.1)
       hashie (>= 3.4, <= 5.0)
-      inspec (>= 2.2.64, < 5.0)
+      inspec (>= 2.2.64, < 7.0)
       test-kitchen (>= 2.7, < 4)
-    kitchen-salt (0.6.3)
+    kitchen-salt (0.7.2)
       hashie (>= 3.5)
       test-kitchen (>= 1.4)
-    kitchen-vagrant (1.10.0)
+    kitchen-vagrant (1.12.0)
       test-kitchen (>= 1.4, < 4)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
@@ -377,21 +396,21 @@ GEM
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
     little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.16.2)
-    mixlib-config (3.0.9)
+    mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.19)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (3.0.9)
-    mixlib-shellout (3.2.5)
+    mixlib-shellout (3.2.7)
       chef-utils
     mixlib-versioning (1.2.12)
     mongo (2.13.2)
@@ -406,51 +425,72 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.7.6)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nori (2.6.0)
-    os (1.1.1)
+    options (2.3.2)
-    parallel (1.21.0)
+    os (1.1.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    progress_bar (1.3.3)
+      highline (>= 1.6, < 3)
+      options (~> 2.3.0)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
-    representable (3.1.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.2.5)
-    rspec (3.10.0)
+    rspec (3.11.0)
-      rspec-core (~> 3.10.0)
+      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.10.0)
+      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.10.0)
+      rspec-mocks (~> 3.11.0)
-    rspec-core (3.10.1)
+    rspec-core (3.11.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
-    rspec-support (3.10.2)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
-    semverse (3.0.0)
+    semverse (3.0.2)
-    signet (0.16.0)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     sslshake (1.3.1)
@@ -459,7 +499,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (3.1.0)
+    test-kitchen (3.3.1)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
@@ -473,11 +513,11 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (1.1.0)
+    thor (1.2.1)
     timeliness (0.3.10)
     tomlrb (1.3.0)
-    trailblazer-option (0.1.1)
+    trailblazer-option (0.1.2)
-    train (3.8.1)
+    train (3.10.1)
       activesupport (>= 6.0.3.1)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
@@ -488,9 +528,9 @@ GEM
       google-api-client (>= 0.23.9, <= 0.52.0)
       googleauth (>= 0.6.6, <= 0.14.0)
       inifile (~> 3.0)
-      train-core (= 3.8.1)
+      train-core (= 3.10.1)
       train-winrm (~> 0.2)
-    train-aws (0.2.20)
+    train-aws (0.2.24)
       aws-sdk-alexaforbusiness (~> 1.0)
       aws-sdk-amplify (~> 1.32.0)
       aws-sdk-apigateway (~> 1.0)
@@ -529,6 +569,7 @@ GEM
       aws-sdk-elasticloadbalancing (~> 1.8)
       aws-sdk-elasticloadbalancingv2 (~> 1.0)
       aws-sdk-elasticsearchservice (~> 1.0)
+      aws-sdk-emr (~> 1.53.0)
       aws-sdk-eventbridge (~> 1.24.0)
       aws-sdk-firehose (~> 1.0)
       aws-sdk-glue (>= 1.71, < 1.89)
@@ -549,6 +590,7 @@ GEM
       aws-sdk-route53domains (~> 1.0)
       aws-sdk-route53resolver (~> 1.0)
       aws-sdk-s3 (~> 1.30)
+      aws-sdk-s3control (~> 1.43.0)
       aws-sdk-secretsmanager (>= 1.42, < 1.47)
       aws-sdk-securityhub (~> 1.0)
       aws-sdk-servicecatalog (>= 1.48, < 1.61)
@@ -561,8 +603,10 @@ GEM
       aws-sdk-sqs (~> 1.10)
       aws-sdk-ssm (~> 1.0)
       aws-sdk-states (>= 1.35, < 1.40)
+      aws-sdk-synthetics (~> 1.19.0)
       aws-sdk-transfer (>= 1.26, < 1.35)
-    train-core (3.8.1)
+      aws-sdk-waf (~> 1.43.0)
+    train-core (3.10.1)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
@@ -570,7 +614,7 @@ GEM
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
     train-habitat (0.2.22)
-    train-winrm (0.2.12)
+    train-winrm (0.2.13)
       winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
@@ -597,8 +641,8 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     unicode_utils (1.4.0)
     winrm (2.3.6)
       builder (>= 2.1.2)
@@ -619,7 +663,6 @@ GEM
       rubyzip (~> 2.0)
       winrm (~> 2.0)
     wisper (2.0.1)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -628,7 +671,7 @@ DEPENDENCIES
   inspec!
   kitchen-docker!
   kitchen-inspec (>= 2.5.0)
-  kitchen-salt (>= 0.6.3)
+  kitchen-salt (>= 0.7.2)
   kitchen-vagrant
 
 BUNDLED WITH

apache/config/init.sls

@@ -2,14 +2,4 @@
 # vim: ft=sls
 
 include:
-  - .file
-  # .modules.clean  # disable (exclude from init state)
-  # .modules        # enable by default (read pillars)
-  # .debian_full
-  - .flags
-  - .logrotate
-  - .manage_security
-  - .no_default_vhost
-  # .own_default_vhost
-  - .register_site
   - .vhosts

apache/config/logrotate.sls

@@ -8,6 +8,18 @@ apache-config-logrotate-file-managed:
   file.managed:
     - name: {{ apache.logrotatedir }}
     - makedirs: True
+    {%- if grains.os_family == "RedHat" %}
+    - contents: |
+        {{ apache.logdir }}/*log {
+            missingok
+            notifempty
+            sharedscripts
+            delaycompress
+            postrotate
+                /bin/systemctl reload {{ apache.service.name }}.service > /dev/null 2>/dev/null || true
+            endscript
+         }
+    {% else %}
     - contents: |
         {{ apache.logdir }}/*.log {
                 daily
@@ -29,3 +41,4 @@ apache-config-logrotate-file-managed:
                     fi; \
                 endscript
         }
+    {% endif %}

apache/config/vhosts/standard.sls

@@ -30,10 +30,6 @@ apache-config-vhosts-standard-{{ id }}:
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
-      - module: apache-service-running-reload
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
       - service: apache-service-running
 
       {%- if site.get('DocumentRoot') != False %}
@@ -57,10 +53,6 @@ apache-config-vhosts-standard-{{ id }}-cmd-run-a2en:
     - require:
       - file: apache-config-vhosts-standard-{{ id }}
     - watch_in:
-      - module: apache-service-running-reload
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
       - service: apache-service-running
 
           {%- else %}
@@ -72,10 +64,6 @@ apache-config-vhosts-standard-{{ id }}-cmd-run-a2dis:
     - require:
       - file: apache-config-vhosts-standard-{{ id }}
     - watch_in:
-      - module: apache-service-running-reload
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
       - service: apache-service-running
 
           {%- endif %}

apache/osfamilymap.yaml

@@ -74,19 +74,19 @@ RedHat:
   mod_geoip: mod_geoip
   mod_geoip_database: GeoIP
 
-  vhostdir: /etc/httpd/vhosts.d
+  vhostdir: /etc/httpd/conf.d
   confdir: /etc/httpd/conf.d
   modulesdir: /usr/lib64/httpd/modules
   confext: .conf
   default_site: default
-  default_site_ssl: default-ssl
+  default_site_ssl: ssl
   logdir: /var/log/httpd
   logrotatedir: /etc/logrotate.d/httpd
   wwwdir: /var/www
   default_charset: UTF-8
   use_require: false
   moddir: /etc/httpd/conf.modules.d
-  sitesdir: /etc/httpd/sites-enabled
+  sitesdir: /etc/httpd/conf.d
 
 Suse:
   pkg:

apache/package/install.sls

@@ -4,6 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
+{#- consider moving this to an optional state or enabling it with a pillar option
     {%- if 'deps' in apache.pkg and apache.pkg.deps and apache.pkg.deps is iterable and apache.pkg.deps is not string %}
 apache-package-install-deps-pkg-installed:
   pkg.installed:
@@ -11,6 +12,7 @@ apache-package-install-deps-pkg-installed:
     - require:
       - apache-package-install-pkg-installed
     {%- endif %}
+#}
 
 apache-package-install-pkg-installed:
     {%- if grains.os_family == 'Windows' %}

apache/service/running.sls

@@ -2,63 +2,10 @@
 # vim: ft=sls
 
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- set sls_config_registersite = tplroot ~ '.config.register_site' %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
-include:
-  - {{ sls_config_file }}
-  - {{ sls_config_registersite }}
-
 apache-service-running:
-  {%- if salt['pillar.get']('apache:manage_service_states', True) %}
-      {# By default run apache service states (unless pillar is false) #}
   service.running:
     - name: {{ apache.service.name }}
     - enable: True
-    - watch:
+    - reload: True
-      - sls: {{ sls_config_file }}
-    - retry: {{ apache.retry_option|json }}
-  cmd.run:
-    - names:
-      - journalctl -xe -u {{ apache.service.name }} || tail -20 /var/log/messages || true
-      - (service {{ apache.service.name }} restart && service {{ apache.service.name }} status) || true
-      - cat {{ apache.config }}
-    - onfail:
-      - service: apache-service-running
-  {%- endif %}
-
-  {# The following states are by default inert and can be used #}
-  {# by other states to trigger a restart or reload as needed. #}
-
-apache-service-running-restart:
-  module.wait:
-         {%- if apache.service_state in ['running'] %}
-    - name: service.restart
-    - m_name: {{ apache.service.name }}
-         {%- else %}
-    - name: cmd.run
-    - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
-    - python_shell: True
-         {%- endif %}
-    - watch:
-      - sls: {{ sls_config_file }}
-    - require:
-      - sls: {{ sls_config_file }}
-      - service: apache-service-running
-
-apache-service-running-reload:
-  module.wait:
-         {%- if apache.service_state in ['running'] %}
-    - name: service.reload
-    - m_name: {{ apache.service.name }}
-         {%- else %}
-    - name: cmd.run
-    - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
-    - python_shell: True
-         {%- endif %}
-    - watch:
-      - sls: {{ sls_config_file }}
-    - require:
-      - sls: {{ sls_config_file }}
-      - service: apache-service-running

bin/kitchen

@@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
     load(bundle_binstub)
   else
     abort(
-      'Your `bin/bundle` was not generated by Bundler, '\
+      'Your `bin/bundle` was not generated by Bundler, ' \
-      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
       '`bundle binstubs bundler --force`, then run this command again.'
     )
   end

docs/AUTHORS.rst

@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - Contributions
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 145
+     - 147
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
      - `@alxwr <https://github.com/alxwr>`_
      - 40
@@ -262,6 +262,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1021809?v=4' width='36' height='36' alt='@ardin'>`
      - `@ardin <https://github.com/ardin>`_
      - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/45118187?v=4' width='36' height='36' alt='@l00d3r'>`
+     - `@l00d3r <https://github.com/l00d3r>`_
+     - 1
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17029228?v=4' width='36' height='36' alt='@mcarlton00'>`
      - `@mcarlton00 <https://github.com/mcarlton00>`_
      - 1
@@ -287,4 +290,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-10-20.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-10-28.

docs/CHANGELOG.rst

@@ -2,6 +2,15 @@
 Changelog
 =========
 
+`1.2.2 <https://github.com/saltstack-formulas/apache-formula/compare/v1.2.1...v1.2.2>`_ (2021-10-28)
+--------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **redhat:** use correct vhostdir, sitesdir and logrotate script for redhat family (\ `#376 <https://github.com/saltstack-formulas/apache-formula/issues/376>`_\ ) (\ `c4b8538 <https://github.com/saltstack-formulas/apache-formula/commit/c4b85381288ae878207ffa5d2cc36cabc916e8f1>`_\ )
+
 `1.2.1 <https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1>`_ (2021-10-20)
 --------------------------------------------------------------------------------------------------------
 

docs/antora.yml

@@ -1,7 +1,7 @@
 ---
 name: 'apache-formula'
 title: 'apache-formula'
-version: '1.2.1'
+version: '1.2.2'
 start_page: 'README.adoc'
 nav:
   - 'modules/ROOT/nav-repo-docs.adoc'

docs/modules/ROOT/pages/AUTHORS.adoc

@@ -12,7 +12,7 @@ _descending_ order.
 
 |image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36]
 |https://github.com/myii[@myii^]
-|145 
+|147 
 
 |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36]
 |https://github.com/alxwr[@alxwr^]
@@ -343,6 +343,10 @@ _descending_ order.
 |https://github.com/ardin[@ardin^]
 |1 
 
+|image::https://avatars.githubusercontent.com/u/45118187?v=4[@l00d3r,36,36]
+|https://github.com/l00d3r[@l00d3r^]
+|1 
+
 |image::https://avatars.githubusercontent.com/u/17029228?v=4[@mcarlton00,36,36]
 |https://github.com/mcarlton00[@mcarlton00^]
 |1
@@ -376,4 +380,4 @@ _descending_ order.
 
 Auto-generated by a https://github.com/myii/maintainer[forked version^]
 of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on
-2021-10-20.
+2021-10-28.

docs/modules/ROOT/pages/CHANGELOG.adoc

@@ -2,6 +2,15 @@
 
 :sectnums!:
 
+== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.2.1...v1.2.2++[1.2.2^] (2021-10-28)
+
+=== Bug Fixes
+
+* *redhat:* use correct vhostdir, sitesdir and logrotate script for
+redhat family
+(https://github.com/saltstack-formulas/apache-formula/issues/376[#376^])
+(https://github.com/saltstack-formulas/apache-formula/commit/c4b85381288ae878207ffa5d2cc36cabc916e8f1[c4b8538^])
+
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1++[1.2.1^] (2021-10-20)
 
 === Bug Fixes

kitchen.vagrant.yml

@@ -9,8 +9,8 @@ driver:
   gui: false
   ssh:
     shell: /bin/sh
-  <% unless ENV['CI'] %>
   linked_clone: true
+  <% unless ENV['CI'] %>
   synced_folders:
     - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
       - '/vagrant'
@@ -21,14 +21,12 @@ platforms:
   - name: freebsd-130-master-py3
     driver:
       box: myii/freebsd-13.0-master-py3
-      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
+  - name: freebsd-123-master-py3
-  - name: freebsd-122-master-py3
     driver:
-      box: myii/freebsd-12.2-master-py3
+      box: myii/freebsd-12.3-master-py3
-  - name: freebsd-130-3003-1-py3
+  - name: freebsd-130-3004-0-py3
     driver:
-      box: myii/freebsd-13.0-3003.1-py3
+      box: myii/freebsd-13.0-3004.0-py3
-      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
+  - name: freebsd-123-3004-0-py3
-  - name: freebsd-122-3003-1-py3
     driver:
-      box: myii/freebsd-12.2-3003.1-py3
+      box: myii/freebsd-12.3-3004.0-py3

kitchen.yml

@@ -32,6 +32,10 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:debian-9
       run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04
@@ -40,9 +44,9 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-tiamat-py3
+  - name: centos-stream8-tiamat-py3
     driver:
-      image: saltimages/salt-tiamat-py3:centos-8
+      image: saltimages/salt-tiamat-py3:centos-stream8
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
@@ -75,6 +79,10 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:debian-9
       run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
@@ -83,18 +91,18 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-master-py3
+  - name: centos-stream8-master-py3
     driver:
-      image: saltimages/salt-master-py3:centos-8
+      image: saltimages/salt-master-py3:centos-stream8
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
-  - name: fedora-34-master-py3
+  - name: fedora-36-master-py3
     driver:
-      image: saltimages/salt-master-py3:fedora-34
+      image: saltimages/salt-master-py3:fedora-36
-  - name: fedora-33-master-py3
+  - name: fedora-35-master-py3
     driver:
-      image: saltimages/salt-master-py3:fedora-33
+      image: saltimages/salt-master-py3:fedora-35
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -102,13 +110,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: opensuse-tmbl-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@@ -142,226 +143,120 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3003.3`
+  ## SALT `3004.1`
-  - name: debian-11-3003-3-py3
+  - name: debian-11-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-11
+      image: saltimages/salt-3004.1-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3003-3-py3
+  - name: debian-10-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-10
+      image: saltimages/salt-3004.1-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3003-3-py3
+  - name: debian-9-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-9
+      image: saltimages/salt-3004.1-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-3-py3
+  - name: ubuntu-2204-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-20.04
+      image: saltimages/salt-3004.1-py3:ubuntu-22.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-3-py3
+  - name: ubuntu-2004-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-18.04
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3003-3-py3
+  - name: ubuntu-1804-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:centos-8
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-  - name: centos-7-3003-3-py3
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:centos-7
+      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: fedora-34-3003-3-py3
+  - name: centos-7-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-34
+      image: saltimages/salt-3004.1-py3:centos-7
-  - name: fedora-33-3003-3-py3
+  - name: fedora-36-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-33
+      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: opensuse-leap-153-3003-3-py3
+  - name: fedora-35-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
+      image: saltimages/salt-3004.1-py3:fedora-35
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+  - name: amazonlinux-2-3004-1-py3
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-leap-152-3003-3-py3
     driver:
-      image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
+      image: saltimages/salt-3004.1-py3:amazonlinux-2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+  - name: oraclelinux-8-3004-1-py3
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3003-3-py3
     driver:
-      image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3004.1-py3:oraclelinux-8
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+  - name: oraclelinux-7-3004-1-py3
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3003-3-py3
     driver:
-      image: saltimages/salt-3003.3-py3:amazonlinux-2
+      image: saltimages/salt-3004.1-py3:oraclelinux-7
-  - name: oraclelinux-8-3003-3-py3
+  - name: arch-base-latest-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:oraclelinux-8
+      image: saltimages/salt-3004.1-py3:arch-base-latest
-  - name: oraclelinux-7-3003-3-py3
+  - name: gentoo-stage3-latest-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:oraclelinux-7
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
-  - name: arch-base-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3003-3-py3
+  - name: gentoo-stage3-systemd-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3003-3-py3
+  - name: almalinux-8-3004-1-py3
     driver:
-      image: saltimages/salt-3003.3-py3:almalinux-8
+      image: saltimages/salt-3004.1-py3:almalinux-8
+  - name: rockylinux-8-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:rockylinux-8
 
-  ## SALT `3002.7`
+  ## SALT `3004.0`
-  - name: debian-11-3002-7-py3
+  - name: opensuse-leap-153-3004-0-py3
     driver:
-      image: saltimages/salt-3002.7-py3:debian-11
+      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
-      run_command: /lib/systemd/systemd
-  - name: debian-10-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-8-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:centos-8
-  - name: centos-7-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:centos-7
-  - name: fedora-34-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:fedora-34
-  - name: fedora-33-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:fedora-33
-  - name: opensuse-leap-153-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3002-7-py3
+  - name: opensuse-tmbl-latest-3004-0-py3
     driver:
-      image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
+      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
     # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:oraclelinux-7
-  - name: arch-base-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
 
-  ## SALT `3001.8`
+  ## SALT `3003.4`
-  - name: debian-10-3001-8-py3
+  - name: debian-10-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:debian-10
+      image: saltimages/salt-3003.4-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3001-8-py3
+  - name: debian-9-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:debian-9
+      image: saltimages/salt-3003.4-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3001-8-py3
+  - name: ubuntu-2004-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:ubuntu-20.04
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3001-8-py3
+  - name: ubuntu-1804-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3001-8-py3
+  - name: centos-stream8-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:centos-8
+      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-7-3001-8-py3
+  - name: centos-7-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:centos-7
+      image: saltimages/salt-3003.4-py3:centos-7
-  - name: fedora-34-3001-8-py3
+  - name: amazonlinux-2-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:fedora-34
+      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: fedora-33-3001-8-py3
+  - name: oraclelinux-8-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:fedora-33
+      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: opensuse-leap-153-3001-8-py3
+  - name: oraclelinux-7-3003-4-py3
     driver:
-      image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
+      image: saltimages/salt-3003.4-py3:oraclelinux-7
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+  - name: almalinux-8-3003-4-py3
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-leap-152-3001-8-py3
     driver:
-      image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
+      image: saltimages/salt-3003.4-py3:almalinux-8
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:oraclelinux-7
-  - name: arch-base-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
 
 verifier:
   # https://www.inspec.io/

pre-commit_semantic-release.sh

@@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
 
 
 ###############################################################################
-# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
+# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst`
 ###############################################################################
 
-# Install `m2r`
+# Install `m2r2`
-pip3 install m2r
+pip3 install m2r2
 
 # Copy and then convert the `.md` docs
 cp ./*.md docs/
 cd docs/ || exit
-m2r --overwrite ./*.md
+m2r2 --overwrite ./*.md
 
 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst

test/integration/default/controls/config_spec.rb

@@ -16,10 +16,10 @@ control 'apache configuration' do
     moddir = '/etc/apache2/mods-enabled'
     sitesdir = '/etc/apache2/vhosts.d'
   when 'redhat', 'fedora'
-    vhostdir = '/etc/httpd/vhosts.d'
+    vhostdir = '/etc/httpd/conf.d'
     logrotatedir = '/etc/logrotate.d/httpd'
     moddir = '/etc/httpd/conf.modules.d'
-    sitesdir = '/etc/httpd/sites-enabled'
+    sitesdir = '/etc/httpd/conf.d'
   when 'gentoo'
     vhostdir = '/etc/apache2/vhosts.d'
     logrotatedir = '/etc/logrotate.d/apache2'

test/integration/default/inspec.yml

@@ -24,4 +24,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

test/integration/modules/controls/config_spec.rb

@@ -18,11 +18,11 @@ control 'apache configuration' do
     moddir = '/etc/apache2/mods-enabled'
     sitesdir = '/etc/apache2/vhosts.d'
   when 'redhat', 'fedora'
-    vhostdir = '/etc/httpd/vhosts.d'
+    vhostdir = '/etc/httpd/conf.d'
     logrotatedir = '/etc/logrotate.d/httpd'
     logdir = '/var/log/httpd'
     moddir = '/etc/httpd/conf.modules.d'
-    sitesdir = '/etc/httpd/sites-enabled'
+    sitesdir = '/etc/httpd/conf.d'
     apachectl = 'httpd -t'
   when 'gentoo'
     vhostdir = '/etc/apache2/vhosts.d'

test/integration/modules/inspec.yml

@@ -24,4 +24,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

test/integration/share/inspec.yml

@@ -21,4 +21,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

test/integration/share/libraries/system.rb

@@ -4,6 +4,7 @@
 # Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
 # Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
 
+# rubocop:disable Metrics/ClassLength
 class SystemResource < Inspec.resource(1)
   name 'system'
 
@@ -21,7 +22,8 @@ class SystemResource < Inspec.resource(1)
       family: build_platform_family,
       name: build_platform_name,
       release: build_platform_release,
-      finger: build_platform_finger
+      finger: build_platform_finger,
+      codename: build_platform_codename
     }
   end
 
@@ -55,12 +57,16 @@ class SystemResource < Inspec.resource(1)
       'base-latest'
     when 'gentoo'
       "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
+    when 'mac_os_x'
+      inspec.command('sw_vers -productVersion').stdout.to_s
     when 'opensuse'
       # rubocop:disable Style/NumericLiterals,Layout/LineLength
       inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
       # rubocop:enable Style/NumericLiterals,Layout/LineLength
     when 'windows_8.1_pro'
       '8.1'
+    when 'windows_server_2022_datacenter'
+      '2022-server'
     when 'windows_server_2019_datacenter'
       '2019-server'
     when 'windows_server_2016_datacenter'
@@ -87,4 +93,46 @@ class SystemResource < Inspec.resource(1)
       build_platform_release.split('.')[0]
     end
   end
+
+  # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
+  def build_platform_codename
+    case build_platform_finger
+    when 'ubuntu-22.04'
+      'jammy'
+    when 'ubuntu-20.04'
+      'focal'
+    when 'ubuntu-18.04'
+      'bionic'
+    when 'debian-11'
+      'bullseye'
+    when 'debian-10'
+      'buster'
+    when 'debian-9'
+      'stretch'
+    when 'almalinux-8'
+      "AlmaLinux #{build_platform_release} (Arctic Sphynx)"
+    when 'amazonlinux-2'
+      'Amazon Linux 2'
+    when 'arch-base-latest'
+      'Arch Linux'
+    when 'centos-7'
+      'CentOS Linux 7 (Core)'
+    when 'centos-8'
+      'CentOS Stream 8'
+    when 'opensuse-tumbleweed'
+      'openSUSE Tumbleweed'
+    when 'opensuse-15'
+      "openSUSE Leap #{build_platform_release}"
+    when 'oraclelinux-8', 'oraclelinux-7'
+      "Oracle Linux Server #{build_platform_release}"
+    when 'gentoo-2-sysd', 'gentoo-2-sysv'
+      'Gentoo/Linux'
+    when 'rockylinux-8'
+      "Rocky Linux #{build_platform_release} (Green Obsidian)"
+    else
+      ''
+    end
+  end
+  # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity
 end
+# rubocop:enable Metrics/ClassLength