Disable journal dump on fail

Too noisy.

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

.github/workflows/kitchen.vagrant.yml

@@ -17,15 +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-114-master-py3
+          # - default-freebsd-130-3004-0-py3
-          # - modules-freebsd-114-master-py3
+          # - default-freebsd-123-3004-0-py3
-          - freebsd-114-master-py3
-          # - default-freebsd-130-3002-6-py3
-          # - default-freebsd-122-3002-6-py3
-          # - default-freebsd-114-3002-6-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

.gitignore

@@ -127,6 +127,7 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
+!test/salt/pillar/top.sls
 
 # `suricata-formula` -- Platform binaries
 *.rpm

.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,51 +118,69 @@ 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'}
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
+# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-debian-11-master-py3: {extends: '.test_instance'}
+# modules-debian-11-master-py3: {extends: '.test_instance'}
+debian-11-master-py3: {extends: '.test_instance'}
 # default-debian-10-master-py3: {extends: '.test_instance'}
 # modules-debian-10-master-py3: {extends: '.test_instance'}
 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-152-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-# modules-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# modules-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+opensuse-leap-153-master-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-# modules-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# modules-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 # 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'}
@@ -182,65 +200,43 @@ modules-arch-base-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # modules-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3003-0-py3: {extends: '.test_instance'}
+# default-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-9-3003-0-py3: {extends: '.test_instance'}
+# modules-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
+almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-8-3003-0-py3: {extends: '.test_instance'}
+# modules-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-7-3003-0-py3: {extends: '.test_instance'}
+rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
+# default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
+# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
+# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
+# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
+# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-debian-9-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-centos-8-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# default-centos-7-3002-6-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
+# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
+# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
+# default-debian-10-3003-4-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
+# default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-debian-10-3001-7-py3: {extends: '.test_instance'}
+# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# default-debian-9-3001-7-py3: {extends: '.test_instance'}
+# default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-centos-8-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-centos-7-3001-7-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
+# yamllint enable rule:line-length
-# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
-# default-debian-10-3000-9-py3: {extends: '.test_instance'}
-# default-debian-9-3000-9-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# default-centos-8-3000-9-py3: {extends: '.test_instance'}
-# default-centos-7-3000-9-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
-# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3000-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
@@ -52,3 +64,14 @@ repos:
       - id: rstcheck
         name: Check reST files using rstcheck
         exclude: 'docs/CHANGELOG.rst'
+  - repo: https://github.com/saltstack-formulas/mirrors-rst-lint
+    rev: v1.3.2
+    hooks:
+      - id: rst-lint
+        name: Check reST files using rst-lint
+        exclude: |
+            (?x)^(
+                docs/CHANGELOG.rst|
+                docs/TOFS_pattern.rst|
+            )$
+        additional_dependencies: [pygments==2.9.0]

.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

@@ -83,42 +83,52 @@ jobs:
     ## 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`
+    # - 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
     # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
+    # - env: INSTANCE=default-almalinux-8-tiamat-py3
+    # - env: INSTANCE=default-rockylinux-8-tiamat-py3
+    # - env: INSTANCE=default-debian-11-master-py3
+    # - env: INSTANCE=modules-debian-11-master-py3
+    - env: INSTANCE=debian-11-master-py3
     # - env: INSTANCE=default-debian-10-master-py3
     # - env: INSTANCE=modules-debian-10-master-py3
     - env: INSTANCE=debian-10-master-py3
     # - 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-152-master-py3
+    # - env: INSTANCE=default-opensuse-leap-153-master-py3
-    # - env: INSTANCE=modules-opensuse-leap-152-master-py3
+    # - env: INSTANCE=modules-opensuse-leap-153-master-py3
-    - env: INSTANCE=opensuse-leap-152-master-py3
+    - env: INSTANCE=opensuse-leap-153-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
@@ -141,65 +151,42 @@ jobs:
     # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=modules-gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-10-3003-0-py3
+    # - env: INSTANCE=default-almalinux-8-master-py3
-    # - env: INSTANCE=default-debian-9-3003-0-py3
+    # - env: INSTANCE=modules-almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-0-py3
+    - env: INSTANCE=almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-0-py3
+    # - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-8-3003-0-py3
+    # - env: INSTANCE=modules-rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-7-3003-0-py3
+    - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=default-fedora-34-3003-0-py3
+    # - env: INSTANCE=default-debian-11-3004-1-py3
-    # - env: INSTANCE=default-fedora-33-3003-0-py3
+    # - env: INSTANCE=default-debian-10-3004-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-0-py3
+    # - env: INSTANCE=default-debian-9-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-0-py3
+    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-0-py3
+    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=default-arch-base-latest-3003-0-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3
+    # - env: INSTANCE=default-centos-stream8-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3
+    # - env: INSTANCE=default-centos-7-3004-1-py3
-    # - env: INSTANCE=default-debian-10-3002-6-py3
+    # - env: INSTANCE=default-fedora-36-3004-1-py3
-    # - env: INSTANCE=default-debian-9-3002-6-py3
+    # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-6-py3
+    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-6-py3
+    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=default-centos-8-3002-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
-    # - env: INSTANCE=default-centos-7-3002-6-py3
+    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
-    # - env: INSTANCE=default-fedora-34-3002-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
-    # - env: INSTANCE=default-fedora-33-3002-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-6-py3
+    # - env: INSTANCE=default-almalinux-8-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-6-py3
+    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-6-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-arch-base-latest-3002-6-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
+    # - env: INSTANCE=default-debian-10-3003-4-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
+    # - env: INSTANCE=default-debian-9-3003-4-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=default-debian-10-3001-7-py3
+    # - env: INSTANCE=default-centos-stream8-3003-4-py3
-    # - env: INSTANCE=default-debian-9-3001-7-py3
+    # - env: INSTANCE=default-centos-7-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-7-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-7-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
-    # - env: INSTANCE=default-centos-8-3001-7-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=default-centos-7-3001-7-py3
+    # - env: INSTANCE=default-almalinux-8-3003-4-py3
-    # - env: INSTANCE=default-fedora-34-3001-7-py3
-    # - env: INSTANCE=default-fedora-33-3001-7-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-7-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-7-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-7-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3
-    # - env: INSTANCE=default-debian-10-3000-9-py3
-    # - env: INSTANCE=default-debian-9-3000-9-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=default-centos-8-3000-9-py3
-    # - env: INSTANCE=default-centos-7-3000-9-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
-    # - env: INSTANCE=default-amazonlinux-2-3000-9-py3
-    # - env: INSTANCE=default-oraclelinux-8-3000-9-py3
-    # - env: INSTANCE=default-oraclelinux-7-3000-9-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-9-py2
-    # - env: INSTANCE=default-arch-base-latest-3000-9-py2
-    # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

.yamllint

@@ -5,13 +5,15 @@
 extends: 'default'
 
 # Files to ignore completely
-# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run
+# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
-# 2. All YAML files under directory `.git/`
+# 2. All YAML files under directory `.cache/`, introduced during the CI run
-# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
+# 3. All YAML files under directory `.git/`
-# 4. Any SLS files under directory `test/`, which are actually state files
+# 4. All YAML files under directory `node_modules/`, introduced during the CI run
-# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 5. Any SLS files under directory `test/`, which are actually state files
-# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
+# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
 ignore: |
+  .bundle/
   .cache/
   .git/
   node_modules/

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)|109
+<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
@@ -18,7 +18,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|10
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/904839?v=4' width='36' height='36' alt='@landergate'>|[@landergate](https://github.com/landergate)|9
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3045456?v=4' width='36' height='36' alt='@bradthurber'>|[@bradthurber](https://github.com/bradthurber)|8
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|8
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>|[@babilen](https://github.com/babilen)|8
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurlogilab'>|[@arthurlogilab](https://github.com/arthurlogilab)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>|[@stp-ip](https://github.com/stp-ip)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17673243?v=4' width='36' height='36' alt='@porunov'>|[@porunov](https://github.com/porunov)|7
@@ -40,6 +40,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/228723?v=4' width='36' height='36' alt='@abednarik'>|[@abednarik](https://github.com/abednarik)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12513495?v=4' width='36' height='36' alt='@dexbleeker'>|[@dexbleeker](https://github.com/dexbleeker)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/112249?v=4' width='36' height='36' alt='@vincentfretin'>|[@vincentfretin](https://github.com/vincentfretin)|3
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>|[@bogdanr](https://github.com/bogdanr)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/11229682?v=4' width='36' height='36' alt='@carlovollebregt'>|[@carlovollebregt](https://github.com/carlovollebregt)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4313010?v=4' width='36' height='36' alt='@thornycrackers'>|[@thornycrackers](https://github.com/thornycrackers)|2
@@ -63,6 +64,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1640672?v=4' width='36' height='36' alt='@ev0rtex'>|[@ev0rtex](https://github.com/ev0rtex)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/42472863?v=4' width='36' height='36' alt='@dimitry-unified-streaming'>|[@dimitry-unified-streaming](https://github.com/dimitry-unified-streaming)|1
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/89458395?v=4' width='36' height='36' alt='@fniepelt'>|[@fniepelt](https://github.com/fniepelt)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>|[@fintanmm](https://github.com/fintanmm)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/215487?v=4' width='36' height='36' alt='@fcrozat'>|[@fcrozat](https://github.com/fcrozat)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38090329?v=4' width='36' height='36' alt='@genaumann'>|[@genaumann](https://github.com/genaumann)|1
@@ -83,9 +85,9 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4156131?v=4' width='36' height='36' alt='@skylerberg'>|[@skylerberg](https://github.com/skylerberg)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7967223?v=4' width='36' height='36' alt='@TiepiNL'>|[@TiepiNL](https://github.com/TiepiNL)|1
 <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/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|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
@@ -96,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-06-28.
+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,52 @@
 # 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)
+
+
+### Bug Fixes
+
+* **vhosts:** reset `cleanup` to previous and use dedicated `clean` SLS ([0c6c1d3](https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73))
+
+
+### Continuous Integration
+
+* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([a3d49f1](https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d))
+* test for upstream Salt regressions in `master` instances (2021-W37a) ([69dcfd9](https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c))
+
+
+### Documentation
+
+* **readme:** document vhosts clean/cleanup ([2d72dff](https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d)), closes [#372](https://github.com/saltstack-formulas/apache-formula/issues/372)
+
+# [1.2.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0) (2021-08-28)
+
+
+### Bug Fixes
+
+* **suse:** use correct vhostdir and sitesdir for suse family ([#369](https://github.com/saltstack-formulas/apache-formula/issues/369)) ([fe0ceb7](https://github.com/saltstack-formulas/apache-formula/commit/fe0ceb78b7d4e9f67bc4d5b684b847bdcc604b20)), closes [/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2](https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html/issues/sec-apache2)
+
+
+### Continuous Integration
+
+* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([2e116ec](https://github.com/saltstack-formulas/apache-formula/commit/2e116ec4123b846edd85b651c9634e03cb102abf))
+* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([d679580](https://github.com/saltstack-formulas/apache-formula/commit/d67958043df41515350a4b02c5de81e0d83eb813))
+* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([5dd7009](https://github.com/saltstack-formulas/apache-formula/commit/5dd700944b413411fc3557063125f22c1eb6f62a))
+* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([0d1a6dc](https://github.com/saltstack-formulas/apache-formula/commit/0d1a6dc75d1a781518bf4d7262dbfb4cfbc2c0b9))
+* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([d3641d7](https://github.com/saltstack-formulas/apache-formula/commit/d3641d7f0d427d9e8be9d20bd03f84977d1cba22))
+* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([7741b90](https://github.com/saltstack-formulas/apache-formula/commit/7741b90ff66719c1abfca3fb306d07ee47cbd4c8))
+
+
+### Features
+
+* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] ([4353e57](https://github.com/saltstack-formulas/apache-formula/commit/4353e57a1b652186f552472f16f1b06f8fb4f0a1))
+
 ## [1.1.8](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8) (2021-06-28)
 
 

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.1.8
+version: 1.2.2
 release: 1
 minimum_version: 2015.8
 summary: Formula for installing Apache

Gemfile

@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
 
-# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
+# Install the `inspec` gem using `git` because versions after `4.22.22`
-# regression where the diff isn't displayed when comparing using `eq`.
+# suppress diff output; this version fixes this for our uses.
-gem 'inspec',      '~> 4.22.22'
+# rubocop:disable Layout/LineLength
-# Install the `kitchen-docker` gem using `git` because the latest version
+gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
-# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
+# rubocop:enable Layout/LineLength
+
+# Install the `kitchen-docker` gem using `git` in order to gain a performance
+# improvement: avoid package installations which are already covered by the
+# `salt-image-builder` (i.e. the pre-salted images that we're using)
 # rubocop:disable Layout/LineLength
 gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
 # rubocop:enable Layout/LineLength
-gem 'kitchen-inspec', '>= 2.2.1'
+
-gem 'kitchen-salt', '>= 0.6.3'
+gem 'kitchen-inspec', '>= 2.5.0'
+gem 'kitchen-salt', '>= 0.7.2'
 
 group :vagrant do
   gem 'kitchen-vagrant'

Gemfile.lock

@@ -1,323 +1,420 @@
 GIT
-  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
+  remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
+  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
   branch: ssf
   specs:
-    kitchen-docker (2.10.0)
+    inspec (5.18.15)
+      cookstyle
+      faraday_middleware (>= 0.12.2, < 1.1)
+      inspec-core (= 5.18.15)
+      mongo (= 2.13.2)
+      progress_bar (~> 1.3.3)
+      rake
+      train (~> 3.10)
+      train-aws (~> 0.2)
+      train-habitat (~> 0.1)
+      train-winrm (~> 0.2)
+    inspec-core (5.18.15)
+      addressable (~> 2.4)
+      chef-telemetry (~> 1.0, >= 1.0.8)
+      faraday (>= 0.9.0, < 1.5)
+      faraday_middleware (~> 1.0)
+      hashie (>= 3.4, < 5.0)
+      license-acceptance (>= 0.2.13, < 3.0)
+      method_source (>= 0.8, < 2.0)
+      mixlib-log (~> 3.0)
+      multipart-post (~> 2.0)
+      parallel (~> 1.9)
+      parslet (>= 1.5, < 2.0)
+      pry (~> 0.13)
+      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.10)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
+
+GIT
+  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
+  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
+  branch: ssf
+  specs:
+    kitchen-docker (2.12.0)
       test-kitchen (>= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
+    ast (2.4.2)
-    aws-partitions (1.386.0)
+    aws-eventstream (1.2.0)
-    aws-sdk-apigateway (1.55.0)
+    aws-partitions (1.607.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-alexaforbusiness (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.29.0)
+    aws-sdk-amplify (1.32.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.33.0)
+    aws-sdk-apigateway (1.78.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.22.0)
+    aws-sdk-apigatewayv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.52.1)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.36.0)
+    aws-sdk-applicationautoscaling (1.51.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.44.0)
+    aws-sdk-athena (1.55.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.46.0)
+    aws-sdk-autoscaling (1.63.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.27.0)
+    aws-sdk-batch (1.47.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.30.0)
+    aws-sdk-budgets (1.50.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.29.0)
+    aws-sdk-cloudformation (1.70.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.45.0)
+    aws-sdk-cloudfront (1.65.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.38.0)
+    aws-sdk-cloudhsm (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.40.0)
+    aws-sdk-cloudhsmv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.37.0)
+    aws-sdk-cloudtrail (1.49.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.37.0)
+    aws-sdk-cloudwatch (1.64.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.53.0)
+    aws-sdk-cloudwatchevents (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.109.1)
+    aws-sdk-cloudwatchlogs (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codecommit (1.51.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codedeploy (1.49.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codepipeline (1.53.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)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cognitoidentityprovider (1.53.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.79.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.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.28.0)
+    aws-sdk-costandusagereportservice (1.40.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.55.0)
+    aws-sdk-databasemigrationservice (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.202.0)
+    aws-sdk-dynamodb (1.75.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.39.0)
+    aws-sdk-ec2 (1.322.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.70.0)
+    aws-sdk-ecr (1.56.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.36.0)
+    aws-sdk-ecrpublic (1.12.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.45.0)
+    aws-sdk-ecs (1.100.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.44.0)
+    aws-sdk-efs (1.54.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.39.0)
+    aws-sdk-eks (1.75.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.29.0)
+    aws-sdk-elasticache (1.78.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.53.0)
+    aws-sdk-elasticbeanstalk (1.51.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.43.0)
+    aws-sdk-elasticloadbalancing (1.40.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.35.0)
+    aws-sdk-elasticloadbalancingv2 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.42.0)
+    aws-sdk-elasticsearchservice (1.65.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.46.0)
+    aws-sdk-emr (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.29.0)
+    aws-sdk-eventbridge (1.24.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.30.0)
+    aws-sdk-firehose (1.48.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-glue (1.88.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.51.0)
+    aws-sdk-guardduty (1.58.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-organizations (1.17.0)
+    aws-sdk-iam (1.69.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.104.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.50.0)
+    aws-sdk-kafka (1.50.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.44.0)
+    aws-sdk-kinesis (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.28.0)
+    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.21.0)
+    aws-sdk-lambda (1.84.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-mq (1.40.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-networkfirewall (1.17.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-networkmanager (1.24.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)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ram (1.26.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-rds (1.148.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-redshift (1.84.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53 (1.63.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53domains (1.40.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53resolver (1.37.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.114.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-securityhub (1.35.0)
+    aws-sdk-secretsmanager (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.36.0)
+    aws-sdk-securityhub (1.67.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sms (1.27.0)
+    aws-sdk-servicecatalog (1.60.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.34.0)
+    aws-sdk-ses (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.34.0)
+    aws-sdk-shield (1.48.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.95.0)
+    aws-sdk-signer (1.32.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sdk-simpledb (1.29.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv2 (~> 1.0)
+    aws-sdk-sms (1.40.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sns (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.51.1)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ssm (1.137.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.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure_graph_rbac (0.17.2)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_key_vault (0.17.6)
+    azure_mgmt_key_vault (0.17.7)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_resources (0.18.0)
+    azure_mgmt_resources (0.18.2)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_security (0.18.2)
+    azure_mgmt_security (0.19.0)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.22.0)
+    azure_mgmt_storage (0.23.0)
       ms_rest_azure (~> 0.12.0)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
+    bson (4.15.0)
     builder (3.2.4)
-    chef-config (16.6.14)
+    chef-config (17.10.0)
       addressable
-      chef-utils (= 16.6.14)
+      chef-utils (= 17.10.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-telemetry (1.0.14)
+    chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-      ffi-yajl (~> 2.2)
+    chef-utils (17.10.0)
-    chef-utils (16.6.14)
+      concurrent-ruby
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
+    cookstyle (7.32.1)
+      rubocop (= 1.25.1)
     declarative (0.0.20)
-    declarative-option (0.1.0)
+    diff-lcs (1.5.0)
-    diff-lcs (1.4.4)
+    docker-api (2.2.0)
-    docker-api (2.0.0)
       excon (>= 0.47.0)
       multi_json
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ecma-re-validator (0.2.1)
+    ed25519 (1.3.0)
-      regexp_parser (~> 1.2)
+    erubi (1.10.0)
-    ed25519 (1.2.4)
+    excon (0.92.3)
-    erubi (1.9.0)
+    faraday (1.4.3)
-    excon (0.78.0)
+      faraday-em_http (~> 1.0)
-    faraday (0.17.3)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
+    faraday-em_http (1.0.0)
-      faraday (>= 0.7.4, < 1.0)
+    faraday-em_synchrony (1.0.0)
-    ffi (1.13.1)
+    faraday-excon (1.1.0)
-    ffi-yajl (2.3.4)
+    faraday-net_http (1.0.1)
-      libyajl2 (~> 1.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    ffi (1.15.5)
     fuzzyurl (0.9.0)
-    google-api-client (0.44.0)
+    google-api-client (0.52.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
+      rexml
       signet (~> 0.12)
-    googleauth (0.13.0)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
-    hana (1.3.6)
+      rexml (~> 3.0)
-    hashie (3.6.0)
+    hashie (4.1.0)
-    http-cookie (1.0.3)
+    highline (2.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
-    inspec (4.22.22)
+    jmespath (1.6.1)
-      faraday_middleware (~> 0.12.2)
+    json (2.6.2)
-      inspec-core (= 4.22.22)
+    jwt (2.4.1)
-      train (~> 3.0)
+    kitchen-inspec (2.6.1)
-      train-aws (~> 0.1)
+      hashie (>= 3.4, <= 5.0)
-      train-habitat (~> 0.1)
+      inspec (>= 2.2.64, < 7.0)
-      train-winrm (~> 0.2)
+      test-kitchen (>= 2.7, < 4)
-    inspec-core (4.22.22)
+    kitchen-salt (0.7.2)
-      addressable (~> 2.4)
-      chef-telemetry (~> 1.0)
-      faraday (>= 0.9.0)
-      hashie (~> 3.4)
-      json_schemer (>= 0.2.1, < 0.2.12)
-      license-acceptance (>= 0.2.13, < 2.0)
-      method_source (>= 0.8, < 2.0)
-      mixlib-log (~> 3.0)
-      multipart-post (~> 2.0)
-      parallel (~> 1.9)
-      parslet (~> 1.5)
-      pry (~> 0.13)
-      rspec (~> 3.9)
-      rspec-its (~> 1.2)
-      rubyzip (~> 1.2, >= 1.2.2)
-      semverse (~> 3.0)
-      sslshake (~> 1.2)
-      thor (>= 0.20, < 2.0)
-      tomlrb (~> 1.2.0)
-      train-core (~> 3.0)
-      tty-prompt (~> 0.17)
-      tty-table (~> 0.10)
-    jmespath (1.4.0)
-    json (2.3.1)
-    json_schemer (0.2.11)
-      ecma-re-validator (~> 0.2)
-      hana (~> 1.3)
-      regexp_parser (~> 1.5)
-      uri_template (~> 0.7)
-    jwt (2.2.2)
-    kitchen-inspec (2.2.1)
-      hashie (~> 3.4)
-      inspec (>= 2.2.64, < 5.0)
-      test-kitchen (>= 2.7, < 3)
-    kitchen-salt (0.6.3)
       hashie (>= 3.5)
       test-kitchen (>= 1.4)
-    kitchen-vagrant (1.7.0)
+    kitchen-vagrant (1.12.0)
-      test-kitchen (>= 1.4, < 3)
+      test-kitchen (>= 1.4, < 4)
-    libyajl2 (1.2.0)
+    license-acceptance (2.1.13)
-    license-acceptance (1.0.19)
       pastel (~> 0.7)
-      tomlrb (~> 1.2)
+      tomlrb (>= 1.2, < 3.0)
-      tty-box (~> 0.3)
+      tty-box (~> 0.6)
-      tty-prompt (~> 0.18)
+      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.0.2)
+    mini_mime (1.1.2)
-    minitest (5.14.2)
+    minitest (5.16.2)
-    mixlib-config (3.0.9)
+    mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.3)
+    mixlib-install (3.12.19)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (3.0.9)
-    mixlib-shellout (3.1.6)
+    mixlib-shellout (3.2.7)
       chef-utils
     mixlib-versioning (1.2.12)
+    mongo (2.13.2)
+      bson (>= 4.8.2, < 5.0.0)
     ms_rest (0.7.6)
       concurrent-ruby (~> 1.0)
       faraday (>= 0.9, < 2.0.0)
@@ -328,60 +425,83 @@ 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.19.2)
+    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)
-    pry (0.13.1)
+    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)
-    regexp_parser (1.8.2)
+    rainbow (3.1.1)
-    representable (3.0.4)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rspec (3.9.0)
+    rexml (3.2.5)
-      rspec-core (~> 3.9.0)
+    rspec (3.11.0)
-      rspec-expectations (~> 3.9.0)
+      rspec-core (~> 3.11.0)
-      rspec-mocks (~> 3.9.0)
+      rspec-expectations (~> 3.11.0)
-    rspec-core (3.9.3)
+      rspec-mocks (~> 3.11.0)
-      rspec-support (~> 3.9.3)
+    rspec-core (3.11.0)
-    rspec-expectations (3.9.3)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.11.0)
-    rspec-support (3.9.4)
+    rspec-support (3.11.0)
-    rubyntlm (0.6.2)
+    rubocop (1.25.1)
-    rubyzip (1.3.0)
+      parallel (~> 1.10)
-    semverse (3.0.0)
+      parser (>= 3.1.0.0)
-    signet (0.14.0)
+      rainbow (>= 2.2.2, < 4.0)
-      addressable (~> 2.3)
+      regexp_parser (>= 1.8, < 3.0)
-      faraday (>= 0.17.3, < 2.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.2)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     sslshake (1.3.1)
-    strings (0.2.0)
+    strings (0.2.1)
       strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (2.7.2)
+    test-kitchen (3.3.1)
       bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
@@ -393,28 +513,32 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (1.0.1)
+    thor (1.2.1)
-    thread_safe (0.3.6)
     timeliness (0.3.10)
-    tomlrb (1.2.9)
+    tomlrb (1.3.0)
-    train (3.3.27)
+    trailblazer-option (0.1.2)
-      activesupport (>= 5.2.4.3, < 6.0.0)
+    train (3.10.1)
+      activesupport (>= 6.0.3.1)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
       azure_mgmt_security (~> 0.18)
       azure_mgmt_storage (~> 0.18)
       docker-api (>= 1.26, < 3.0)
-      google-api-client (>= 0.23.9, < 0.44.1)
+      google-api-client (>= 0.23.9, <= 0.52.0)
-      googleauth (>= 0.6.6, < 0.13.1)
+      googleauth (>= 0.6.6, <= 0.14.0)
       inifile (~> 3.0)
-      train-core (= 3.3.27)
+      train-core (= 3.10.1)
       train-winrm (~> 0.2)
-    train-aws (0.1.18)
+    train-aws (0.2.24)
+      aws-sdk-alexaforbusiness (~> 1.0)
+      aws-sdk-amplify (~> 1.32.0)
       aws-sdk-apigateway (~> 1.0)
       aws-sdk-apigatewayv2 (~> 1.0)
+      aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
       aws-sdk-athena (~> 1.0)
-      aws-sdk-autoscaling (~> 1.22.0)
+      aws-sdk-autoscaling (>= 1.22, < 1.64)
+      aws-sdk-batch (>= 1.36, < 1.48)
       aws-sdk-budgets (~> 1.0)
       aws-sdk-cloudformation (~> 1.0)
       aws-sdk-cloudfront (~> 1.0)
@@ -422,16 +546,21 @@ GEM
       aws-sdk-cloudhsmv2 (~> 1.0)
       aws-sdk-cloudtrail (~> 1.8)
       aws-sdk-cloudwatch (~> 1.13)
+      aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
       aws-sdk-cloudwatchlogs (~> 1.13)
       aws-sdk-codecommit (~> 1.0)
       aws-sdk-codedeploy (~> 1.0)
       aws-sdk-codepipeline (~> 1.0)
+      aws-sdk-cognitoidentity (>= 1.26, < 1.32)
+      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54)
       aws-sdk-configservice (~> 1.21)
       aws-sdk-core (~> 3.0)
       aws-sdk-costandusagereportservice (~> 1.6)
+      aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
       aws-sdk-dynamodb (~> 1.31)
       aws-sdk-ec2 (~> 1.70)
       aws-sdk-ecr (~> 1.18)
+      aws-sdk-ecrpublic (~> 1.3)
       aws-sdk-ecs (~> 1.30)
       aws-sdk-efs (~> 1.0)
       aws-sdk-eks (~> 1.9)
@@ -440,48 +569,65 @@ 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)
       aws-sdk-guardduty (~> 1.31)
       aws-sdk-iam (~> 1.13)
       aws-sdk-kafka (~> 1.0)
       aws-sdk-kinesis (~> 1.0)
       aws-sdk-kms (~> 1.13)
       aws-sdk-lambda (~> 1.0)
-      aws-sdk-organizations (~> 1.17.0)
+      aws-sdk-mq (~> 1.40.0)
+      aws-sdk-networkfirewall (>= 1.6.0)
+      aws-sdk-networkmanager (>= 1.13.0)
+      aws-sdk-organizations (>= 1.17, < 1.60)
+      aws-sdk-ram (>= 1.21, < 1.27)
       aws-sdk-rds (~> 1.43)
       aws-sdk-redshift (~> 1.0)
       aws-sdk-route53 (~> 1.0)
       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-ses (~> 1.0)
+      aws-sdk-servicecatalog (>= 1.48, < 1.61)
+      aws-sdk-ses (~> 1.41.0)
+      aws-sdk-shield (~> 1.30)
+      aws-sdk-signer (~> 1.32.0)
+      aws-sdk-simpledb (~> 1.29.0)
       aws-sdk-sms (~> 1.0)
       aws-sdk-sns (~> 1.9)
       aws-sdk-sqs (~> 1.10)
       aws-sdk-ssm (~> 1.0)
-    train-core (3.3.27)
+      aws-sdk-states (>= 1.35, < 1.40)
+      aws-sdk-synthetics (~> 1.19.0)
+      aws-sdk-transfer (>= 1.26, < 1.35)
+      aws-sdk-waf (~> 1.43.0)
+    train-core (3.10.1)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-habitat (0.2.13)
+    train-habitat (0.2.22)
-    train-winrm (0.2.11)
+    train-winrm (0.2.13)
-      winrm (~> 2.0)
+      winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
-    tty-box (0.6.0)
+    tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-cursor (~> 0.7)
-    tty-color (0.5.2)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
+    tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
@@ -490,16 +636,15 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    tzinfo (1.2.7)
+    tzinfo (2.0.4)
-      thread_safe (~> 0.1)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8.2)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.2.0)
     unicode_utils (1.4.0)
-    uri_template (0.7.0)
+    winrm (2.3.6)
-    winrm (2.3.5)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
@@ -507,15 +652,15 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.2)
+    winrm-elevated (1.2.3)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.3)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
+      rubyzip (~> 2.0)
       winrm (~> 2.0)
     wisper (2.0.1)
 
@@ -523,10 +668,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  inspec (~> 4.22.22)
+  inspec!
   kitchen-docker!
-  kitchen-inspec (>= 2.2.1)
+  kitchen-inspec (>= 2.5.0)
-  kitchen-salt (>= 0.6.3)
+  kitchen-salt (>= 0.7.2)
   kitchen-vagrant
 
 BUNDLED WITH

apache/config/certificates/clean.sls

@@ -2,11 +2,11 @@
 # vim: ft=sls
 
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- set sls_service_running = tplroot ~ '.service.running' %}
+{%- set sls_service_clean = tplroot ~ '.service.clean' %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
 include:
-  - {{ sls_service_running }}
+  - {{ sls_service_clean }}
 
 {%- for site, cert in salt['pillar.get']('apache:sites', {}).items() %}
 
@@ -15,12 +15,8 @@ include:
 apache_cert_config_clean_{{ site }}_key_file:
   file.absent:
     - name: {{ cert.SSLCertificateKeyFile }}
-    - watch_in:
+    - require:
-      - module: apache-service-running-reload
+      - sls: {{ sls_service_clean }}
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
-      - service: apache-service-running
 
     {%- endif %}
     {%- if cert.SSLCertificateFile is defined %}
@@ -28,25 +24,17 @@ apache_cert_config_clean_{{ site }}_key_file:
 apache_cert_config_clean_{{ site }}_cert_file:
   file.absent:
     - name: {{ cert.SSLCertificateFile }}
-    - watch_in:
+    - require:
-      - module: apache-service-running-reload
+      - sls: {{ sls_service_clean }}
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
-      - service: apache-service-running
 
     {%- endif %}
     {%- if cert.SSLCertificateChainFile is defined %}
 
 apache_cert_config_clean_{{ site }}_bundle_file:
-  file.managed:
+  file.absent:
     - name: {{ cert.SSLCertificateChainFile }}
-    - watch_in:
+    - require:
-      - module: apache-service-running-reload
+      - sls: {{ sls_service_clean }}
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
-      - service: apache-service-running
 
     {%- endif %}
 {%- endfor %}

apache/config/clean.sls

@@ -3,6 +3,7 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
+{%- set sls_modules_clean = tplroot ~ '.config.modules.clean' %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
 include:
@@ -21,3 +22,4 @@ apache-config-clean-file-absent:
       - {{ apache.confdir }}/server-status{{ apache.confext }}
     - require:
       - sls: {{ sls_service_clean }}
+      - sls: {{ sls_modules_clean }}

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/modules/clean.sls

@@ -3,11 +3,11 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_package_clean = tplroot ~ '.package.clean' %}
-{%- set sls_service_dead = tplroot ~ '.service.clean' %}
+{%- set sls_service_clean = tplroot ~ '.service.clean' %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
 include:
-  - {{ sls_service_dead }}
+  - {{ sls_service_clean }}
 
     {%- set existing_states = salt['cp.list_states']() %}
     {%- for module in salt['pillar.get']('apache:modules:disabled', []) %}
@@ -45,8 +45,6 @@ apache-config-modules-{{ module }}-disable:
 
     - order: 225
     - require:
-      - sls: {{ sls_service_dead }}
+      - sls: {{ sls_service_clean }}
-    - require_in:
-      - pkg: apache-package-clean-pkg-removed
 
     {%- endfor %}

apache/config/modules/mod_fastcgi.sls

@@ -38,7 +38,7 @@ apache-config-modules-fastcgi_cmd-run:
     - unless: ls {{ apache.moddir }}/fastcgi.load
     - order: 225
     - require:
-      - pkg: mod-fastcgi
+      - pkg: apache-config-modules-fastcgi-pkg
     - watch_in:
       - module: apache-service-running-restart
     - require_in:

apache/config/modules/mod_php5.sls

@@ -25,7 +25,7 @@ apache-config-modules-php5-pkg:
     - unless: ls {{ apache.moddir }}/php5.load || egrep "^APACHE_MODULES=" /etc/sysconfig/apache2 | grep ' php5'
     - order: 225
     - require:
-      - pkg: mod-php5
+      - pkg: apache-config-modules-php5-pkg
     - watch_in:
       - module: apache-service-running-restart
     - require_in:

apache/config/modules/mod_security/rules.sls

@@ -1,9 +1,11 @@
-{%- set apache = pillar.get('apache', {}) %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import apache with context %}
+{#- set apache = pillar.get('apache', {}) #}
 {%- set mod_security = apache.get('mod_security', {}) %}
 {%- if mod_security.get('manage_config', False) %}
 
 include:
-  - apache.mod_security
+  - apache.config.modules.mod_security
 
 {%- for rule_name, rule_details in mod_security.get('rules', {}).items() %}
   {%- set rule_set = rule_details.get('rule_set', '') %}

apache/config/modules/mod_upload_progress.sls

@@ -13,7 +13,7 @@ include:
   - {{ sls_package_install }}
 
 apache-config-modules-upload_progress-pkg:
-  pkg.installed
+  pkg.installed:
     - name: {{ apache.mod_upload_progress }}
   cmd.run:
     - name: a2enmod upload_progress

apache/config/modules/mod_wsgi.sls

@@ -12,9 +12,9 @@ include:
 
 apache-config-modules-wsgi-pkg:
   pkg.installed:
-    - name: {{ apache.pkg.mod_wsgi }}
+    - name: {{ apache.mod_wsgi }}
     - require:
-      - pkg: apache
+      - pkg: apache-package-install-pkg-installed
     - watch_in:
       - module: apache-service-running-restart
     - require_in:

apache/config/vhosts/clean.sls

@@ -1 +0,0 @@
-cleanup.sls

apache/config/vhosts/clean.sls

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_service_clean = tplroot ~ '.service.clean' %}
+{%- from tplroot ~ "/map.jinja" import apache with context %}
+
+    {%- if grains.os_family == 'Debian' %}
+
+include:
+  - {{ sls_service_clean }}
+
+        {%- set dirpath = '/etc/apache2/sites-enabled' %}
+        {# Add . and .. to make it easier to not clean those #}
+        {%- set valid_sites = ['.', '..', ] %}
+
+        {# Take sites from apache.vhosts.standard #}
+        {%- for id, site in salt['pillar.get']('apache:sites', {}).items() %}
+            {%- do valid_sites.append('{}{}'.format(id, apache.confext)) %}
+        {%- endfor %}
+
+        {# Take sites from apache.register_site #}
+        {%- for id, site in salt['pillar.get']('apache:register-site', {}).items() %}
+            {%- do valid_sites.append('{}{}'.format(site.name, apache.confext)) %}
+        {%- endfor %}
+
+        {%- if salt['file.directory_exists'](dirpath) %}
+            {%- for filename in salt['file.readdir'](dirpath) %}
+                {%- if filename not in valid_sites %}
+
+apache-config-vhosts-clean-{{ filename }}-cmd-run:
+  cmd.run:
+    - name: a2dissite {{ filename }} || true
+    - onlyif: "test -L {{ dirpath }}/{{ filename }} || test -f {{ dirpath }}/{{ filename }}"
+    - require:
+      - sls: {{ sls_service_clean }}
+
+                {%- endif %}
+            {%- endfor %}
+        {%- endif %}
+    {%- endif %}{# Debian #}

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

@@ -26,7 +26,7 @@ Debian:
   portsfile: /etc/apache2/ports.conf
 
   mod_wsgi: libapache2-mod-wsgi
-  mod_php5: libapache2-mod-php5
+  mod_php5: libapache2-mod-php
   mod_perl2: libapache2-mod-perl2
   mod_fcgid: libapache2-mod-fcgid
   mod_upload_progress: libapache2-mod-upload-progress
@@ -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:
@@ -109,7 +109,7 @@ Suse:
   mod_geoip: apache2-mod_geoip
   mod_geoip_database: GeoIP-data
 
-  vhostdir: /etc/apache2/sites-available
+  vhostdir: /etc/apache2/vhosts.d
   confdir: /etc/apache2/conf.d
   modulesdir: /usr/lib64/apache2/modules
   confext: .conf
@@ -119,7 +119,7 @@ Suse:
   logrotatedir: /etc/logrotate.d/apache2
   wwwdir: /srv/www
   moddir: /etc/apache2/mods-enabled
-  sitesdir: /etc/apache2/sites-enabled
+  sitesdir: /etc/apache2/vhosts.d
 
 Gentoo:
   pkg:

apache/osmap.yaml

@@ -38,6 +38,26 @@ Amazon-2:
       - GeoIP
       - mod_geoip
 
+AlmaLinux:
+  version: '2.4'
+  pkg:
+    deps:
+      - epel-release
+      - mod_ssl
+      - mod_security
+      - GeoIP
+      # mod_geoip
+
+Rocky:
+  version: '2.4'
+  pkg:
+    deps:
+      - epel-release
+      - mod_ssl
+      - mod_security
+      - GeoIP
+      # mod_geoip
+
 # os_family: Suse
 SUSE: {}
 openSUSE: {}

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>`_
-     - 109
+     - 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
@@ -55,8 +55,8 @@ 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/3045456?v=4' width='36' height='36' alt='@bradthurber'>`
      - `@bradthurber <https://github.com/bradthurber>`_
      - 8
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>`
-     - `@babilen5 <https://github.com/babilen5>`_
+     - `@babilen <https://github.com/babilen>`_
      - 8
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurlogilab'>`
      - `@arthurlogilab <https://github.com/arthurlogilab>`_
@@ -121,6 +121,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/112249?v=4' width='36' height='36' alt='@vincentfretin'>`
      - `@vincentfretin <https://github.com/vincentfretin>`_
      - 3
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
+     - `@Yoda-BZH <https://github.com/Yoda-BZH>`_
+     - 3
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>`
      - `@bogdanr <https://github.com/bogdanr>`_
      - 2
@@ -190,6 +193,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/42472863?v=4' width='36' height='36' alt='@dimitry-unified-streaming'>`
      - `@dimitry-unified-streaming <https://github.com/dimitry-unified-streaming>`_
      - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/89458395?v=4' width='36' height='36' alt='@fniepelt'>`
+     - `@fniepelt <https://github.com/fniepelt>`_
+     - 1
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>`
      - `@fintanmm <https://github.com/fintanmm>`_
      - 1
@@ -250,15 +256,15 @@ 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/326786?v=4' width='36' height='36' alt='@wido'>`
      - `@wido <https://github.com/wido>`_
      - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
-     - `@Yoda-BZH <https://github.com/Yoda-BZH>`_
-     - 1
    * - :raw-html-m2r:`<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
    * - :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
@@ -284,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-06-28.
+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,63 @@
 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)
+--------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **vhosts:** reset ``cleanup`` to previous and use dedicated ``clean`` SLS (\ `0c6c1d3 <https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `a3d49f1 <https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d>`_\ )
+* test for upstream Salt regressions in ``master`` instances (2021-W37a) (\ `69dcfd9 <https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c>`_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **readme:** document vhosts clean/cleanup (\ `2d72dff <https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d>`_\ ), closes `#372 <https://github.com/saltstack-formulas/apache-formula/issues/372>`_
+
+`1.2.0 <https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0>`_ (2021-08-28)
+--------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **suse:** use correct vhostdir and sitesdir for suse family (\ `#369 <https://github.com/saltstack-formulas/apache-formula/issues/369>`_\ ) (\ `fe0ceb7 <https://github.com/saltstack-formulas/apache-formula/commit/fe0ceb78b7d4e9f67bc4d5b684b847bdcc604b20>`_\ ), closes `/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2 <https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html/issues/sec-apache2>`_
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `2e116ec <https://github.com/saltstack-formulas/apache-formula/commit/2e116ec4123b846edd85b651c9634e03cb102abf>`_\ )
+* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] (\ `d679580 <https://github.com/saltstack-formulas/apache-formula/commit/d67958043df41515350a4b02c5de81e0d83eb813>`_\ )
+* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `5dd7009 <https://github.com/saltstack-formulas/apache-formula/commit/5dd700944b413411fc3557063125f22c1eb6f62a>`_\ )
+* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `0d1a6dc <https://github.com/saltstack-formulas/apache-formula/commit/0d1a6dc75d1a781518bf4d7262dbfb4cfbc2c0b9>`_\ )
+* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `d3641d7 <https://github.com/saltstack-formulas/apache-formula/commit/d3641d7f0d427d9e8be9d20bd03f84977d1cba22>`_\ )
+* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `7741b90 <https://github.com/saltstack-formulas/apache-formula/commit/7741b90ff66719c1abfca3fb306d07ee47cbd4c8>`_\ )
+
+Features
+^^^^^^^^
+
+
+* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] (\ `4353e57 <https://github.com/saltstack-formulas/apache-formula/commit/4353e57a1b652186f552472f16f1b06f8fb4f0a1>`_\ )
+
 `1.1.8 <https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8>`_ (2021-06-28)
 --------------------------------------------------------------------------------------------------------
 

docs/README.rst

@@ -299,6 +299,17 @@ Example Pillar:
           SSLCertificateKeyFile: /path/to/ssl.key
           SSLCertificateChainFile: /path/to/ssl.ca.crt
 
+``apache.config.vhosts.clean``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Remove non-declared virtual hosts, and deactivates the service.
+
+``apache.config.vhosts.cleanup``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Remove non-declared virtual hosts, but keeps the service running.
+
+
 Testing
 -------
 

docs/antora.yml

@@ -1,7 +1,7 @@
 ---
 name: 'apache-formula'
 title: 'apache-formula'
-version: '1.1.8'
+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^]
-|109 
+|147 
 
 |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36]
 |https://github.com/alxwr[@alxwr^]
@@ -66,8 +66,8 @@ _descending_ order.
 |https://github.com/bradthurber[@bradthurber^]
 |8
 
-|image::https://avatars.githubusercontent.com/u/117961?v=4[@babilen5,36,36]
+|image::https://avatars.githubusercontent.com/u/117961?v=4[@babilen,36,36]
-|https://github.com/babilen5[@babilen5^]
+|https://github.com/babilen[@babilen^]
 |8 
 
 |image::https://avatars.githubusercontent.com/u/445200?v=4[@arthurlogilab,36,36]
@@ -154,6 +154,10 @@ _descending_ order.
 |https://github.com/vincentfretin[@vincentfretin^]
 |3
 
+|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
+|https://github.com/Yoda-BZH[@Yoda-BZH^]
+|3 
+
 |image::https://avatars.githubusercontent.com/u/1079875?v=4[@bogdanr,36,36]
 |https://github.com/bogdanr[@bogdanr^]
 |2 
@@ -247,6 +251,10 @@ _descending_ order.
 
 |1
 
+|image::https://avatars.githubusercontent.com/u/89458395?v=4[@fniepelt,36,36]
+|https://github.com/fniepelt[@fniepelt^]
+|1 
+
 |image::https://avatars.githubusercontent.com/u/1194646?v=4[@fintanmm,36,36]
 |https://github.com/fintanmm[@fintanmm^]
 |1 
@@ -327,10 +335,6 @@ _descending_ order.
 |https://github.com/wido[@wido^]
 |1 
 
-|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
-|https://github.com/Yoda-BZH[@Yoda-BZH^]
-|1 
-
 |image::https://avatars.githubusercontent.com/u/9978732?v=4[@abehling,36,36]
 |https://github.com/abehling[@abehling^]
 |1 
@@ -339,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
@@ -372,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-06-28.
+2021-10-28.

docs/modules/ROOT/pages/CHANGELOG.adoc

@@ -2,6 +2,69 @@
 
 :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
+
+* *vhosts:* reset `+cleanup+` to previous and use dedicated `+clean+`
+SLS
+(https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73[0c6c1d3^])
+
+=== Continuous Integration
+
+* *kitchen+ci:* update with latest CVE pre-salted images [skip ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d[a3d49f1^])
+* test for upstream Salt regressions in `+master+` instances (2021-W37a)
+(https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c[69dcfd9^])
+
+=== Documentation
+
+* *readme:* document vhosts clean/cleanup
+(https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d[2d72dff^]),
+closes
+https://github.com/saltstack-formulas/apache-formula/issues/372[#372^]
+
+== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0++[1.2.0^] (2021-08-28)
+
+=== Bug Fixes
+
+* *suse:* use correct vhostdir and sitesdir for suse family
+(https://github.com/saltstack-formulas/apache-formula/issues/369[#369^])
+(https://github.com/saltstack-formulas/apache-formula/commit/fe0ceb78b7d4e9f67bc4d5b684b847bdcc604b20[fe0ceb7^]),
+closes
+https://github.com//documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html/issues/sec-apache2[/documentation.suse.com/sles/15-SP3/html/SLES-all/cha-apache2.html#sec-apache2^]
+
+=== Continuous Integration
+
+* *3003.1:* update inc. AlmaLinux, Rocky & `+rst-lint+` [skip ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/2e116ec4123b846edd85b651c9634e03cb102abf[2e116ec^])
+* *freebsd:* update with latest pre-salted Vagrant boxes [skip ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/d67958043df41515350a4b02c5de81e0d83eb813[d679580^])
+* *gemfile+lock:* use `+ssf+` customised `+inspec+` repo [skip ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/5dd700944b413411fc3557063125f22c1eb6f62a[5dd7009^])
+* *kitchen:* move `+provisioner+` block & update `+run_command+` [skip
+ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/0d1a6dc75d1a781518bf4d7262dbfb4cfbc2c0b9[0d1a6dc^])
+* *kitchen+ci:* update with latest `+3003.2+` pre-salted images [skip
+ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/d3641d7f0d427d9e8be9d20bd03f84977d1cba22[d3641d7^])
+* add Debian 11 Bullseye & update `+yamllint+` configuration [skip ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/7741b90ff66719c1abfca3fb306d07ee47cbd4c8[7741b90^])
+
+=== Features
+
+* *alma+rocky:* add platforms (based on CentOS 8) [skip ci]
+(https://github.com/saltstack-formulas/apache-formula/commit/4353e57a1b652186f552472f16f1b06f8fb4f0a1[4353e57^])
+
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8++[1.1.8^] (2021-06-28)
 
 === Bug Fixes
@@ -11,9 +74,10 @@
 
 === Continuous Integration
 
-* *gitlab-ci:* ignore line to avoid `yamllint` violation [skip ci]
+* *gitlab-ci:* ignore line to avoid `+yamllint+` violation [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/a742f4ee00c08e7db34c2f3adcb8c90a58c851aa[a742f4e^])
-* *gitlab-ci:* use `pandoc`-enabled `semantic-release` image [skip ci]
+* *gitlab-ci:* use `+pandoc+`-enabled `+semantic-release+` image [skip
+ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/3bf9c6e6a942b86fd16ca4b222bb6a1781f4e09d[3bf9c6e^])
 * *kitchen+gitlab:* remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/10ce3822dd7ea9868ee986a08e2ccd48bd0026ee[10ce382^])
@@ -24,26 +88,26 @@
 
 === Bug Fixes
 
-* *mod_pagespeed:* add missing colon to `file.directory`
+* *mod_pagespeed:* add missing colon to `+file.directory+`
 (https://github.com/saltstack-formulas/apache-formula/commit/a8b87a583e91b7f69cff8485cb56249c3707ce74[a8b87a5^])
 
 === Continuous Integration
 
-* add `arch-master` to matrix and update `.travis.yml` [skip ci]
+* add `+arch-master+` to matrix and update `+.travis.yml+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/069388be3a624a91b955227188ddee7c3650045e[069388b^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.5...v1.1.6++[1.1.6^] (2021-05-08)
 
 === Documentation
 
-* *changelog:* regenerate via. `semantic-release`
+* *changelog:* regenerate via. `+semantic-release+`
 (https://github.com/saltstack-formulas/apache-formula/commit/de8c82c7533e36e720cf2e44c46154cd8cd3f540[de8c82c^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.4...v1.1.5++[1.1.5^] (2021-05-08)
 
 === Documentation
 
-* *changelog:* regenerate via. `semantic-release`
+* *changelog:* regenerate via. `+semantic-release+`
 (https://github.com/saltstack-formulas/apache-formula/commit/198d525a6a552c8c83842c26f6c74a43ffcd4b79[198d525^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.3...v1.1.4++[1.1.4^] (2021-05-08)
@@ -55,11 +119,11 @@
 
 === Documentation
 
-* *changelog:* regenerate via. `semantic-release`
+* *changelog:* regenerate via. `+semantic-release+`
 (https://github.com/saltstack-formulas/apache-formula/commit/e1f1fa7d8f3ea5a8c307badcfe890f96f57c580f[e1f1fa7^])
-* *changelog:* regenerate via. `semantic-release`
+* *changelog:* regenerate via. `+semantic-release+`
 (https://github.com/saltstack-formulas/apache-formula/commit/a1be1d21dceb304278e680a5ade56c51882e4a0b[a1be1d2^])
-* *changelog:* regenerate via. `semantic-release`
+* *changelog:* regenerate via. `+semantic-release+`
 (https://github.com/saltstack-formulas/apache-formula/commit/56efd35f85fe049b4cdcbd082e38d547bd306a39[56efd35^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3++[1.1.3^] (2021-04-30)
@@ -73,7 +137,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
 
 === Continuous Integration
 
-* *kitchen+gitlab:* adjust matrix to add `3003` [skip ci]
+* *kitchen+gitlab:* adjust matrix to add `+3003+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/3c21740ba52fa5c2b5cf39cddce6a42d13d17988[3c21740^])
 * *vagrant:* add FreeBSD 13.0 [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/298fdf4fb569a3d1d4a9dadedb4c3924bcb8cc9a[298fdf4^])
@@ -84,36 +148,37 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
 
 === Bug Fixes
 
-* *freebsd:* fix `default` suite implementation and tests
+* *freebsd:* fix `+default+` suite implementation and tests
 (https://github.com/saltstack-formulas/apache-formula/commit/0a0f69ee2fc8168696f9f9c4ae786389ff894615[0a0f69e^])
-* *freebsd:* fix `modsecurity` suite implementation and tests
+* *freebsd:* fix `+modsecurity+` suite implementation and tests
 (https://github.com/saltstack-formulas/apache-formula/commit/bc9aa78437d14cf26605f58a3c1e17caed8f05bc[bc9aa78^])
 
 === Continuous Integration
 
 * enable Vagrant-based testing using GitHub Actions
 (https://github.com/saltstack-formulas/apache-formula/commit/6e094e2527748cd4d72690b9289836b17f9289c7[6e094e2^])
-* *gemfile+lock:* use `ssf` customised `kitchen-docker` repo [skip ci]
+* *gemfile+lock:* use `+ssf+` customised `+kitchen-docker+` repo [skip
+ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/53ac4638f3b902c1fd65a64d4344387e26c466c1[53ac463^])
-* *gitlab-ci:* reset after update hook for `rubocop` [skip ci]
+* *gitlab-ci:* reset after update hook for `+rubocop+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/6d40ab7634a42048a0f2b3f2e1173cf2da2a8716[6d40ab7^])
 * *kitchen+ci:* use latest pre-salted images (after CVE) [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/69e9d304fb7d637df1856e0d8ab66be7ddce86c4[69e9d30^])
 * *kitchen+gitlab-ci:* use latest pre-salted images [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/21cb59daa2f70ce6cc46f8d241fb6032c932746c[21cb59d^])
-* *pre-commit:* update hook for `rubocop`
+* *pre-commit:* update hook for `+rubocop+`
 (https://github.com/saltstack-formulas/apache-formula/commit/2c090c3a835e42bd07f0788f4b0965f1c3405662[2c090c3^])
 
 === Documentation
 
-* *readme:* add `Testing with Vagrant` section
+* *readme:* add `+Testing with Vagrant+` section
 (https://github.com/saltstack-formulas/apache-formula/commit/5a6b203bb18f9f28146f33af8175fc3b8c059077[5a6b203^])
 
 === Tests
 
-* standardise use of `share` suite & `_mapdata` state [skip ci]
+* standardise use of `+share+` suite & `+_mapdata+` state [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/e7c2d20f06f23a5ce8a5edaae513775aca0914ab[e7c2d20^])
-* *nomodsecurity:* use adjusted `modules` suite instead
+* *nomodsecurity:* use adjusted `+modules+` suite instead
 (https://github.com/saltstack-formulas/apache-formula/commit/838b9172217c5e067ea0e4a6d2f155ecd1a4b053[838b917^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.0...v1.1.1++[1.1.1^] (2021-01-04)
@@ -125,9 +190,9 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
 
 === Continuous Integration
 
-* *commitlint:* ensure `upstream/master` uses main repo URL [skip ci]
+* *commitlint:* ensure `+upstream/master+` uses main repo URL [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/0145922b52f21469c00c85bf46503411ffd11c56[0145922^])
-* *gitlab-ci:* add `rubocop` linter (with `allow_failure`) [skip ci]
+* *gitlab-ci:* add `+rubocop+` linter (with `+allow_failure+`) [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/bbf012b82eed50db3c35cb25a10d9ca36e40487b[bbf012b^])
 * *gitlab-ci:* use GitLab CI as Travis CI replacement
 (https://github.com/saltstack-formulas/apache-formula/commit/26208c47c644608b00adfa8474616305e7a55e36[26208c4^])
@@ -206,7 +271,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
 
 === Continuous Integration
 
-* *pre-commit:* finalise `rstcheck` configuration [skip ci]
+* *pre-commit:* finalise `+rstcheck+` configuration [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/1c2125c251016097e7d2c0694bf0245a3644605e[1c2125c^])
 
 === Documentation
@@ -214,7 +279,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/302[#302^]
 * *example:* document redirect 80->443 fix
 https://github.com/saltstack-formulas/apache-formula/issues/226[#226^]
 (https://github.com/saltstack-formulas/apache-formula/commit/e15803b4b12df2b6e625673409bc854b1d1dd751[e15803b^])
-* *readme:* fix `rstcheck` violation [skip ci]
+* *readme:* fix `+rstcheck+` violation [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/2747e35ce1e49d46a1fd5f8613ce73517aaed095[2747e35^]),
 closes
 https://github.com//travis-ci.org/github/myii/apache-formula/builds/731605038/issues/L255[/travis-ci.org/github/myii/apache-formula/builds/731605038#L255^]
@@ -230,7 +295,7 @@ https://github.com//travis-ci.org/github/myii/apache-formula/builds/731605038/is
 
 * *pre-commit:* add to formula [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/5532ed7a5b1c9afb5ca4348d3984c5ff357bacad[5532ed7^])
-* *pre-commit:* enable/disable `rstcheck` as relevant [skip ci]
+* *pre-commit:* enable/disable `+rstcheck+` as relevant [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/233111af11dd25b573928e746f19b06bcdbf19b9[233111a^])
 
 === BREAKING CHANGES
@@ -283,18 +348,18 @@ CHANGE: 'uninstall.sls' symlinked to 'clean.sls'
 
 === Bug Fixes
 
-* *vhosts/cleanup:* check `sites-enabled` dir exists before listing it
+* *vhosts/cleanup:* check `+sites-enabled+` dir exists before listing it
 (https://github.com/saltstack-formulas/apache-formula/commit/88373e38f55eab61cf1c4edc68324f3da48f7646[88373e3^]),
 closes
 https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
 
 === Continuous Integration
 
-* *gemfile.lock:* add to repo with updated `Gemfile` [skip ci]
+* *gemfile.lock:* add to repo with updated `+Gemfile+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/61b903e7803eb80b50130834b90ca86d26b9d6c8[61b903e^])
-* *kitchen:* use `saltimages` Docker Hub where available [skip ci]
+* *kitchen:* use `+saltimages+` Docker Hub where available [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/6895fb9764e9cebcbbff05763e367401d6cad959[6895fb9^])
-* *kitchen+travis:* remove `master-py2-arch-base-latest` [skip ci]
+* *kitchen+travis:* remove `+master-py2-arch-base-latest+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/16bb1b06e351efdf9994676de38dec7b0ecd639d[16bb1b0^])
 * *travis:* add notifications => zulip [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/2417a75fe218bd04c719f8eb2e2a7e402a20928e[2417a75^])
@@ -317,9 +382,10 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
 
 === Continuous Integration
 
-* *kitchen:* avoid using bootstrap for `master` instances [skip ci]
+* *kitchen:* avoid using bootstrap for `+master+` instances [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/275b5d5e69fa79f1010852d65f0fcb65cadf735d[275b5d5^])
-* *travis:* use `major.minor` for `semantic-release` version [skip ci]
+* *travis:* use `+major.minor+` for `+semantic-release+` version [skip
+ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/08cced29134ca47824e82ee6afa794233cdb5faa[08cced2^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.39.1...v0.39.2++[0.39.2^] (2019-12-20)
@@ -340,15 +406,15 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
 
 === Continuous Integration
 
-* *gemfile:* restrict `train` gem version until upstream fix [skip ci]
+* *gemfile:* restrict `+train+` gem version until upstream fix [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/13be6f9fac5aae55c48f74c784335c61d7fbaaf2[13be6f9^])
 * *travis:* apply changes from build config validation [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/0aac479c253f95b7fdcb1505476638c2d703bc77[0aac479^])
-* *travis:* opt-in to `dpl v2` to complete build config validation
+* *travis:* opt-in to `+dpl v2+` to complete build config validation
 (https://github.com/saltstack-formulas/apache-formula/commit/19e90ea2d6ef91118ebf59817ef4c91ad876af54[19e90ea^])
-* *travis:* quote pathspecs used with `git ls-files` [skip ci]
+* *travis:* quote pathspecs used with `+git ls-files+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/6608ddf8c5a361b93e6a44658ab1e306953566bf[6608ddf^])
-* *travis:* run `shellcheck` during lint job [skip ci]
+* *travis:* run `+shellcheck+` during lint job [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/2ff6b2f17e1fd48b5f0a4156c2dbd90f07f27025[2ff6b2f^])
 * *travis:* use build config validation (beta) [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/73160b249124df6bbd36b113df71724c019a118f[73160b2^])
@@ -376,54 +442,55 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
 
 === Continuous Integration
 
-* *kitchen:* use `debian-10-master-py3` instead of `develop` [skip ci]
+* *kitchen:* use `+debian-10-master-py3+` instead of `+develop+` [skip
+ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/09d82a581caa09298d3d99ded215c5e45c5b619f[09d82a5^])
-* *kitchen:* use `develop` image until `master` is ready (`amazonlinux`)
+* *kitchen:* use `+develop+` image until `+master+` is ready
- [skip ci]
+(`+amazonlinux+`) [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/d0bf6f37969a9a97a6e368278e0f9eb40431f2f1[d0bf6f3^])
-* *kitchen+travis:* upgrade matrix after `2019.2.2` release [skip ci]
+* *kitchen+travis:* upgrade matrix after `+2019.2.2+` release [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/fc0f869b78ef56369e1cfb6ff3d62179f703efa0[fc0f869^])
-* *travis:* update `salt-lint` config for `v0.0.10` [skip ci]
+* *travis:* update `+salt-lint+` config for `+v0.0.10+` [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/2622d48b4ccb01cd70555d46759d79d82d1db7bf[2622d48^])
 
 === Performance Improvements
 
-* *travis:* improve `salt-lint` invocation [skip ci]
+* *travis:* improve `+salt-lint+` invocation [skip ci]
 (https://github.com/saltstack-formulas/apache-formula/commit/bf7577022040a155de8b3ab4f557dd05484d278c[bf75770^])
 
 == link:++https://github.com/saltstack-formulas/apache-formula/compare/v0.37.4...v0.38.0++[0.38.0^] (2019-10-20)
 
 === Bug Fixes
 
-* *apache-2.2.config.jinja:* fix `salt-lint` errors
+* *apache-2.2.config.jinja:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/f4045ef[f4045ef^])
-* *apache-2.4.config.jinja:* fix `salt-lint` errors
+* *apache-2.4.config.jinja:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/e2c1c2e[e2c1c2e^])
-* *flags.sls:* fix `salt-lint` errors
+* *flags.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/a146c59[a146c59^])
-* *init.sls:* fix `salt-lint` errors
+* *init.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/8465eb4[8465eb4^])
-* *map.jinja:* fix `salt-lint` errors
+* *map.jinja:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/d011324[d011324^])
-* *mod_geoip.sls:* fix `salt-lint` errors
+* *mod_geoip.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/e55ef9b[e55ef9b^])
-* *modsecurity.conf.jinja:* fix `salt-lint` errors
+* *modsecurity.conf.jinja:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/2a79d05[2a79d05^])
-* *modules.sls:* fix `salt-lint` errors
+* *modules.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/55d11f8[55d11f8^])
-* *server_status.sls:* fix `salt-lint` errors
+* *server_status.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/da9a592[da9a592^])
-* *uninstall.sls:* fix `salt-lint` errors
+* *uninstall.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/ed7dc7b[ed7dc7b^])
-* *vhosts/cleanup.sls:* fix `salt-lint` errors
+* *vhosts/cleanup.sls:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/b0bbd0b[b0bbd0b^])
-* *vhosts/minimal.tmpl:* fix `salt-lint` errors
+* *vhosts/minimal.tmpl:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/146dc67[146dc67^])
-* *vhosts/proxy.tmpl:* fix `salt-lint` errors
+* *vhosts/proxy.tmpl:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/e7c9fbb[e7c9fbb^])
-* *vhosts/redirect.tmpl:* fix `salt-lint` errors
+* *vhosts/redirect.tmpl:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/0a41b19[0a41b19^])
-* *vhosts/standard.tmpl:* fix `salt-lint` errors
+* *vhosts/standard.tmpl:* fix `+salt-lint+` errors
 (https://github.com/saltstack-formulas/apache-formula/commit/1bad58d[1bad58d^])
 * *yamllint:* fix all errors
 (https://github.com/saltstack-formulas/apache-formula/commit/97f6ead[97f6ead^])
@@ -432,7 +499,7 @@ https://github.com/saltstack-formulas/apache-formula/issues/278[#278^]
 
 * *formula:* use standard structure
 (https://github.com/saltstack-formulas/apache-formula/commit/701929d[701929d^])
-* *readme:* move to `docs/` directory and modify accordingly
+* *readme:* move to `+docs/+` directory and modify accordingly
 (https://github.com/saltstack-formulas/apache-formula/commit/6933f0e[6933f0e^])
 
 === Features

docs/modules/ROOT/pages/README.adoc

@@ -17,8 +17,8 @@ attention to the
 https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#writing-formulas[Writing
 Formula Section].
 
-If you want to use this formula, please pay attention to the `FORMULA`
+If you want to use this formula, please pay attention to the `+FORMULA+`
-file and/or `git tag`, which contains the currently released version.
+file and/or `+git tag+`, which contains the currently released version.
 This formula is versioned according to http://semver.org/[Semantic
 Versioning].
 
@@ -36,98 +36,98 @@ to contribute] for more details.
 
 == Available states
 
-=== `apache`
+=== `+apache+`
 
 Installs the Apache package and starts the service.
 
-=== `apache.config`
+=== `+apache.config+`
 
 Metastate to apply all apache configuration
 
-=== `apache.config.file`
+=== `+apache.config.file+`
 
 Configures apache based on os_family
 
-=== `apache.config.flags`
+=== `+apache.config.flags+`
 
 Configures apache flags on SuSE
 
-=== `apache.config.certificates`
+=== `+apache.config.certificates+`
 
 Deploy SSL certificates from pillars
 
-=== `apache.config.modules`
+=== `+apache.config.modules+`
 
 Metastate to Enable and disable Apache modules.
 
-=== `apache.config.modules.mod_mpm`
+=== `+apache.config.modules.mod_mpm+`
 
-Configures the apache mpm modules on Debian `mpm_prefork`, `mpm_worker`
+Configures the apache mpm modules on Debian `+mpm_prefork+`,
-or `mpm_event` (Debian Only)
+`+mpm_worker+` or `+mpm_event+` (Debian Only)
 
-=== `apache.config.modules.mod_rewrite`
+=== `+apache.config.modules.mod_rewrite+`
 
 Enabled the Apache module mod_rewrite (Debian and FreeBSD only)
 
-=== `apache.config.modules.mod_proxy`
+=== `+apache.config.modules.mod_proxy+`
 
 Enables the Apache module mod_proxy. (Debian and FreeBSD only)
 
-=== `apache.config.modules.mod_proxy_http`
+=== `+apache.config.modules.mod_proxy_http+`
 
 Enables the Apache module mod_proxy_http and requires the Apache module
 mod_proxy to be enabled. (Debian Only)
 
-=== `apache.config.modules.mod_proxy_fcgi`
+=== `+apache.config.modules.mod_proxy_fcgi+`
 
 Enables the Apache module mod_proxy_fcgi and requires the Apache module
 mod_proxy to be enabled. (Debian Only)
 
-=== `apache.config.modules.mod_wsgi`
+=== `+apache.config.modules.mod_wsgi+`
 
 Installs the mod_wsgi package and enables the Apache module.
 
-=== `apache.config.modules.mod_actions`
+=== `+apache.config.modules.mod_actions+`
 
 Enables the Apache module mod_actions. (Debian Only)
 
-=== `apache.config.modules.mod_headers`
+=== `+apache.config.modules.mod_headers+`
 
 Enables the Apache module mod_headers. (Debian Only)
 
-=== `apache.config.modules.mod_pagespeed`
+=== `+apache.config.modules.mod_pagespeed+`
 
 Installs and Enables the mod_pagespeed module. (Debian and RedHat Only)
 
-=== `apache.config.modules.mod_perl2`
+=== `+apache.config.modules.mod_perl2+`
 
 Installs and enables the mod_perl2 module (Debian and FreeBSD only)
 
-=== `apache.config.modules.mod_geoip`
+=== `+apache.config.modules.mod_geoip+`
 
 Installs and enables the mod_geoIP (RedHat only)
 
-=== `apache.config.modules.mod_php5`
+=== `+apache.config.modules.mod_php5+`
 
 Installs and enables the mod_php5 module
 
-=== `apache.config.modules.mod_cgi`
+=== `+apache.config.modules.mod_cgi+`
 
 Enables mod_cgi. (FreeBSD only)
 
-=== `apache.config.modules.mod_fcgid`
+=== `+apache.config.modules.mod_fcgid+`
 
 Installs and enables the mod_fcgid module (Debian only)
 
-=== `apache.config.modules.mod_fastcgi`
+=== `+apache.config.modules.mod_fastcgi+`
 
 Installs and enables the mod_fastcgi module
 
-=== `apache.config.modules.mod_dav_svn`
+=== `+apache.config.modules.mod_dav_svn+`
 
 Installs and enables the mod_dav_svn module (Debian only)
 
-=== `apache.config.modules.mod_security`
+=== `+apache.config.modules.mod_security+`
 
 Installs an enables the http://modsecurity.org/[Apache mod_security2
 WAF] using data from Pillar. (Debian and RedHat Only)
@@ -135,48 +135,48 @@ WAF] using data from Pillar. (Debian and RedHat Only)
 Allows you to install the basic Core Rules (CRS) and some basic
 configuration for mod_security2
 
-=== `apache.config.modules.mod_security.rules`
+=== `+apache.config.modules.mod_security.rules+`
 
 This state can create symlinks based on basic Core Rules package.
 (Debian only) Or it can distribute a mod_security rule file and place it
 /etc/modsecurity/
 
-=== `apache.config.modules.mod_socache_shmcb`
+=== `+apache.config.modules.mod_socache_shmcb+`
 
 Enables mod_socache_shmcb. (FreeBSD only)
 
-=== `apache.config.modules.mod_ssl`
+=== `+apache.config.modules.mod_ssl+`
 
 Installs and enables the mod_ssl module (Debian, RedHat and FreeBSD
 only)
 
-=== `apache.config.modules.mod_suexec`
+=== `+apache.config.modules.mod_suexec+`
 
 Enables mod_suexec. (FreeBSD only)
 
-=== `apache.config.modules.mod_vhost_alias`
+=== `+apache.config.modules.mod_vhost_alias+`
 
 Enables the Apache module vhost_alias (Debian Only)
 
-=== `apache.config.modules.mod_remoteip`
+=== `+apache.config.modules.mod_remoteip+`
 
 Enables and configures the Apache module mod_remoteip using data from
 Pillar. (Debian Only)
 
-=== `apache.config.modules.mod_xsendfile`
+=== `+apache.config.modules.mod_xsendfile+`
 
 Installs and enables mod_xsendfile module. (Debian Only)
 
-=== `apache.config.own_default_vhost`
+=== `+apache.config.own_default_vhost+`
 
 Replace default vhost with own version. By default, it's 503 code.
 (Debian Only)
 
-=== `apache.config.no_default_vhost`
+=== `+apache.config.no_default_vhost+`
 
 Remove the default vhost. (Debian Only)
 
-=== `apache.config.vhosts.standard`
+=== `+apache.config.vhosts.standard+`
 
 Configures Apache name-based virtual hosts and creates virtual host
 directories using data from Pillar.
@@ -202,29 +202,29 @@ apache:
       interface: '1.2.3.4 [2001:abc:def:100::3]'
 ----
 
-=== `apache.config.manage_security`
+=== `+apache.config.manage_security+`
 
 Configures Apache's security.conf options by reassinging them using data
 from Pillar.
 
-=== `apache.config.modules.mod_status`
+=== `+apache.config.modules.mod_status+`
 
 Configures Apache's server_status handler for localhost
 
-=== `apache.config.debian_full`
+=== `+apache.config.debian_full+`
 
 Installs and configures Apache on Debian and Ubuntu systems.
 
-=== `apache.config.clean`
+=== `+apache.config.clean+`
 
 Metastate to cleanup all apache configuration.
 
-=== `apache.clean`
+=== `+apache.clean+`
 
 Stops the Apache service and uninstalls the package.
 
-These states are ordered using the `order` declaration. Different stages
+These states are ordered using the `+order+` declaration. Different
-are divided into the following number ranges:
+stages are divided into the following number ranges:
 
 [arabic]
 . apache will use 1-500 for ordering
@@ -266,9 +266,17 @@ apache:
       SSLCertificateChainFile: /path/to/ssl.ca.crt
 ----
 
+=== `+apache.config.vhosts.clean+`
+
+Remove non-declared virtual hosts, and deactivates the service.
+
+=== `+apache.config.vhosts.cleanup+`
+
+Remove non-declared virtual hosts, but keeps the service running.
+
 == Testing
 
-Linux testing is done with `kitchen-salt`.
+Linux testing is done with `+kitchen-salt+`.
 
 === Requirements
 
@@ -282,34 +290,34 @@ $ bundle install
 $ bin/kitchen test [platform]
 ----
 
-Where `[platform]` is the platform name defined in `kitchen.yml`, e.g.
+Where `+[platform]+` is the platform name defined in `+kitchen.yml+`,
-`debian-9-2019-2-py3`.
+e.g. `+debian-9-2019-2-py3+`.
 
-=== `bin/kitchen converge`
+=== `+bin/kitchen converge+`
 
-Creates the docker instance and runs the `apache` main states, ready for
+Creates the docker instance and runs the `+apache+` main states, ready
-testing.
+for testing.
 
-=== `bin/kitchen verify`
+=== `+bin/kitchen verify+`
 
-Runs the `inspec` tests on the actual instance.
+Runs the `+inspec+` tests on the actual instance.
 
-=== `bin/kitchen destroy`
+=== `+bin/kitchen destroy+`
 
 Removes the docker instance.
 
-=== `bin/kitchen test`
+=== `+bin/kitchen test+`
 
-Runs all of the stages above in one go: i.e. `destroy` + `converge` +
+Runs all of the stages above in one go: i.e. `+destroy+` + `+converge+`
-`verify` + `destroy`.
++ `+verify+` + `+destroy+`.
 
-=== `bin/kitchen login`
+=== `+bin/kitchen login+`
 
 Gives you SSH access to the instance for manual testing.
 
 == Testing with Vagrant
 
-Windows/FreeBSD/OpenBSD testing is done with `kitchen-salt`.
+Windows/FreeBSD/OpenBSD testing is done with `+kitchen-salt+`.
 
 === Requirements
 
@@ -326,13 +334,13 @@ $ bundle install --with=vagrant
 $ bin/kitchen test [platform]
 ----
 
-Where `[platform]` is the platform name defined in
+Where `+[platform]+` is the platform name defined in
-`kitchen.vagrant.yml`, e.g. `windows-81-latest-py3`.
+`+kitchen.vagrant.yml+`, e.g. `+windows-81-latest-py3+`.
 
 === Note
 
 When testing using Vagrant you must set the environment variable
-`KITCHEN_LOCAL_YAML` to `kitchen.vagrant.yml`. For example:
+`+KITCHEN_LOCAL_YAML+` to `+kitchen.vagrant.yml+`. For example:
 
 [source,bash]
 ----
@@ -343,24 +351,24 @@ $ bin/kitchen test
 
 Then run the following commands as needed.
 
-=== `bin/kitchen converge`
+=== `+bin/kitchen converge+`
 
-Creates the Vagrant instance and runs the `apache` main states, ready
+Creates the Vagrant instance and runs the `+apache+` main states, ready
 for testing.
 
-=== `bin/kitchen verify`
+=== `+bin/kitchen verify+`
 
-Runs the `inspec` tests on the actual instance.
+Runs the `+inspec+` tests on the actual instance.
 
-=== `bin/kitchen destroy`
+=== `+bin/kitchen destroy+`
 
 Removes the Vagrant instance.
 
-=== `bin/kitchen test`
+=== `+bin/kitchen test+`
 
-Runs all of the stages above in one go: i.e. `destroy` + `converge` +
+Runs all of the stages above in one go: i.e. `+destroy+` + `+converge+`
-`verify` + `destroy`.
++ `+verify+` + `+destroy+`.
 
-=== `bin/kitchen login`
+=== `+bin/kitchen login+`
 
 Gives you RDP/SSH access to the instance for manual testing.

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,20 +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-114-master-py3
+  - name: freebsd-130-3004-0-py3
     driver:
-      box: myii/freebsd-11.4-master-py3
+      box: myii/freebsd-13.0-3004.0-py3
-  - name: freebsd-130-3002-6-py3
+  - name: freebsd-123-3004-0-py3
     driver:
-      box: myii/freebsd-13.0-3002.6-py3
+      box: myii/freebsd-12.3-3004.0-py3
-      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
-  - name: freebsd-122-3002-6-py3
-    driver:
-      box: myii/freebsd-12.2-3002.6-py3
-  - name: freebsd-114-3002-6-py3
-    driver:
-      box: myii/freebsd-11.4-3002.6-py3

kitchen.yml

@@ -6,25 +6,47 @@ driver:
   name: docker
   use_sudo: false
   privileged: true
-  run_command: /lib/systemd/systemd
+  run_command: /usr/lib/systemd/systemd
+
+provisioner:
+  name: salt_solo
+  log_level: debug
+  salt_install: none
+  require_chef: false
+  formula: apache
+  salt_copy_filter:
+    - .kitchen
+    - .git
 
 platforms:
   ## SALT `tiamat`
+  - name: debian-11-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-11
+      run_command: /lib/systemd/systemd
   - name: debian-10-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-tiamat-py3
     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
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
-  - name: centos-8-tiamat-py3
+      run_command: /lib/systemd/systemd
+  - 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
@@ -37,44 +59,60 @@ platforms:
   - name: oraclelinux-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:oraclelinux-7
+  - name: almalinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:almalinux-8
+  - name: rockylinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:rockylinux-8
 
   ## SALT `master`
+  - name: debian-11-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-11
+      run_command: /lib/systemd/systemd
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-master-py3
     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
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
-  - name: centos-8-master-py3
+      run_command: /lib/systemd/systemd
+  - 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-152-master-py3
+  - name: opensuse-leap-153-master-py3
     driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.2
+      image: saltimages/salt-master-py3:opensuse-leap-15.3
-      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # 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
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -91,7 +129,6 @@ platforms:
   - name: arch-base-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
   - name: gentoo-stage3-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-latest
@@ -99,249 +136,134 @@ platforms:
   - name: gentoo-stage3-systemd-master-py3
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-systemd
+  - name: almalinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:almalinux-8
+  - name: rockylinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3003.0`
+  ## SALT `3004.1`
-  - name: debian-10-3003-0-py3
+  - name: debian-11-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:debian-10
+      image: saltimages/salt-3004.1-py3:debian-11
-  - name: debian-9-3003-0-py3
+      run_command: /lib/systemd/systemd
+  - name: debian-10-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:debian-9
+      image: saltimages/salt-3004.1-py3:debian-10
-  - name: ubuntu-2004-3003-0-py3
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-20.04
+      image: saltimages/salt-3004.1-py3:debian-9
-  - name: ubuntu-1804-3003-0-py3
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-18.04
+      image: saltimages/salt-3004.1-py3:ubuntu-22.04
-  - name: centos-8-3003-0-py3
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-8
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
-  - name: centos-7-3003-0-py3
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-7
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-  - name: fedora-34-3003-0-py3
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:fedora-34
+      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: fedora-33-3003-0-py3
+  - name: centos-7-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:fedora-33
+      image: saltimages/salt-3004.1-py3:centos-7
-  - name: amazonlinux-2-3003-0-py3
+  - name: fedora-36-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:amazonlinux-2
+      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: oraclelinux-8-3003-0-py3
+  - name: fedora-35-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:oraclelinux-8
+      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: oraclelinux-7-3003-0-py3
+  - name: amazonlinux-2-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:oraclelinux-7
+      image: saltimages/salt-3004.1-py3:amazonlinux-2
-  - name: arch-base-latest-3003-0-py3
+  - name: oraclelinux-8-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:arch-base-latest
+      image: saltimages/salt-3004.1-py3:oraclelinux-8
-      run_command: /usr/lib/systemd/systemd
+  - name: oraclelinux-7-3004-1-py3
-  - name: gentoo-stage3-latest-3003-0-py3
     driver:
-      image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
+      image: saltimages/salt-3004.1-py3:oraclelinux-7
+  - name: arch-base-latest-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3003-0-py3
+  - name: gentoo-stage3-systemd-3004-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3004-1-py3
+    driver:
+      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.6`
+  ## SALT `3004.0`
-  - name: debian-10-3002-6-py3
+  - name: opensuse-leap-153-3004-0-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-10
+      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
-  - name: debian-9-3002-6-py3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    driver:
-      image: saltimages/salt-3002.6-py3:debian-9
-  - name: ubuntu-2004-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-18.04
-  - name: centos-8-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:centos-8
-  - name: centos-7-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:centos-7
-  - name: fedora-34-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:fedora-34
-  - name: fedora-33-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:fedora-33
-  - name: amazonlinux-2-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-7
-  - name: arch-base-latest-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `3002.5`
-  - name: gentoo-stage3-latest-3002-5-py3
-    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-5-py3
-    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
-
-  ## SALT `3002.2`
-  - name: opensuse-leap-152-3002-2-py3
-    driver:
-      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # 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-2-py3
+  - name: opensuse-tmbl-latest-3004-0-py3
     driver:
-      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
 
-  ## SALT `3001.7`
+  ## SALT `3003.4`
-  - name: debian-10-3001-7-py3
+  - name: debian-10-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-10
+      image: saltimages/salt-3003.4-py3:debian-10
-  - name: debian-9-3001-7-py3
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-9
+      image: saltimages/salt-3003.4-py3:debian-9
-  - name: ubuntu-2004-3001-7-py3
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-20.04
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-7-py3
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
-  - name: centos-8-3001-7-py3
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:centos-8
+      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-7-3001-7-py3
+  - name: centos-7-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:centos-7
+      image: saltimages/salt-3003.4-py3:centos-7
-  - name: fedora-34-3001-7-py3
+  - name: amazonlinux-2-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:fedora-34
+      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: fedora-33-3001-7-py3
+  - name: oraclelinux-8-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:fedora-33
+      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: opensuse-leap-152-3001-7-py3
+  - name: oraclelinux-7-3003-4-py3
     driver:
-      image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
+      image: saltimages/salt-3003.4-py3:oraclelinux-7
-      run_command: /usr/lib/systemd/systemd
+  - name: almalinux-8-3003-4-py3
-    # 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-7-py3
     driver:
-      image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3003.4-py3:almalinux-8
-      run_command: /usr/lib/systemd/systemd
-    # 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-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-7
-  - name: arch-base-latest-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `3001.6`
-  - name: gentoo-stage3-latest-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
-
-  ## SALT `3000.9`
-  - name: debian-10-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-10
-  - name: debian-9-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-9
-  - name: ubuntu-1804-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-18.04
-  - name: centos-8-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-8
-  - name: centos-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-7
-  - name: opensuse-leap-152-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # 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: amazonlinux-2-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-7
-  - name: ubuntu-1804-3000-9-py2
-    driver:
-      image: saltimages/salt-3000.9-py2:ubuntu-18.04
-  - name: arch-base-latest-3000-9-py2
-    driver:
-      image: saltimages/salt-3000.9-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `3000.8`
-  - name: gentoo-stage3-latest-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
-
-provisioner:
-  name: salt_solo
-  log_level: debug
-  salt_install: none
-  require_chef: false
-  formula: apache
-  salt_copy_filter:
-    - .kitchen
-    - .git
 
 verifier:
   # https://www.inspec.io/
   name: inspec
   sudo: true
-  # cli, documentation, html, progress, json, json-min, json-rspec, junit
   reporter:
+    # cli, documentation, html, progress, json, json-min, json-rspec, junit
     - cli
 
 suites:

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
@@ -40,9 +40,9 @@ cd ..
 sed -i -e "/^\(version: '\).*\('\)$/s//\1${1}\2/" docs/antora.yml
 
 # Convert the files from `.rst` to `.adoc` using `pandoc`
-FROM=rst && FN=CHANGELOG && pandoc -t asciidoc -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
+FROM=rst && FN=CHANGELOG && pandoc -t asciidoctor -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
-FROM=rst && FN=AUTHORS && pandoc -t asciidoc -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
+FROM=rst && FN=AUTHORS && pandoc -t asciidoctor -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
-FROM=rst && FN=README && pandoc -t asciidoc -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
+FROM=rst && FN=README && pandoc -t asciidoctor -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
 
 # Adjust `CHANGELOG.adoc`
 ADOC="docs/modules/ROOT/pages/CHANGELOG.adoc"

test/integration/default/controls/config_spec.rb

@@ -5,16 +5,21 @@ control 'apache configuration' do
   title 'should match desired lines'
 
   case platform[:family]
-  when 'debian', 'suse'
+  when 'debian'
     vhostdir = '/etc/apache2/sites-available'
     logrotatedir = '/etc/logrotate.d/apache2'
     moddir = '/etc/apache2/mods-enabled'
     sitesdir = '/etc/apache2/sites-enabled'
+  when 'suse'
+    vhostdir = '/etc/apache2/vhosts.d'
+    logrotatedir = '/etc/logrotate.d/apache2'
+    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

@@ -22,4 +22,7 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

test/integration/modules/controls/config_spec.rb

@@ -5,18 +5,24 @@ control 'apache configuration' do
 
   apachectl = 'apachectl -t'
   case platform[:family]
-  when 'debian', 'suse'
+  when 'debian'
     vhostdir = '/etc/apache2/sites-available'
     logrotatedir = '/etc/logrotate.d/apache2'
     logdir = '/var/log/apache2'
     moddir = '/etc/apache2/mods-enabled'
     sitesdir = '/etc/apache2/sites-enabled'
+  when 'suse'
+    vhostdir = '/etc/apache2/vhosts.d'
+    logrotatedir = '/etc/logrotate.d/apache2'
+    logdir = '/var/log/apache2'
+    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

@@ -22,4 +22,7 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

test/integration/share/inspec.yml

@@ -19,4 +19,7 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - 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
 
@@ -36,7 +38,7 @@ class SystemResource < Inspec.resource(1)
 
   def build_platform_name
     case inspec.platform[:name]
-    when 'amazon', 'oracle'
+    when 'amazon', 'oracle', 'rocky'
       "#{inspec.platform[:name]}linux"
     when /^windows_/
       inspec.platform[:family]
@@ -49,18 +51,22 @@ class SystemResource < Inspec.resource(1)
   def build_platform_release
     case inspec.platform[:name]
     when 'amazon'
-      # `2018` relase is named `1` in kitchen.yaml
+      # `2018` relase is named `1` in `kitchen.yml`
       inspec.platform[:release].gsub(/2018.*/, '1')
     when 'arch'
       '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