Include vhosts.d

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
fix(opensuse): pkgrepo.absent TypeError
2023-02-05 03:14:47 +01:00 · 2023-02-05 03:14:46 +01:00 · 2023-02-05 03:14:46 +01:00 · 2023-02-05 03:14:43 +01:00 · 2023-02-04 14:49:28 +01:00 · 2022-07-17 19:46:09 +01:00
44 changed files with 1467 additions and 699 deletions
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@ -14,10 +14,12 @@ jobs:
      fail-fast: false
      matrix:
        instance:
-          - default-freebsd-122-latest-py3
+          - default-freebsd-130-master-py3
-          # - freebsd-122-latest-py3
+          # - freebsd-130-master-py3
-          - default-freebsd-114-latest-py3
+          - default-freebsd-123-master-py3
-          # - freebsd-114-latest-py3
+          # - freebsd-123-master-py3
          # - default-freebsd-130-3004-0-py3
          # - default-freebsd-123-3004-0-py3
    steps:
      - name: 'Check out code'
        uses: 'actions/checkout@v2'
--- a/.gitignore
+++ b/.gitignore
@ -127,6 +127,7 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
 !test/salt/pillar/top.sls
 # `suricata-formula` -- Platform binaries
 *.rpm
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
  stage: *stage_test
  image: *image_dindruby
  services: *services_docker_dind
@ -117,50 +117,65 @@ 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-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # 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'}
 # passenger-debian-11-master-py3: {extends: '.test_instance'}
 debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-debian-10-master-py3: {extends: '.test_instance'}
 # passenger-debian-10-master-py3: {extends: '.test_instance'}
 debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
 # passenger-debian-9-master-py3: {extends: '.test_instance'}
 debian-9-master-py3: {extends: '.test_instance'}
 # default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 # passenger-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'}
 # passenger-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # passenger-ubuntu-1804-master-py3: {extends: '.test_instance'}
 ubuntu-1804-master-py3: {extends: '.test_instance'}
-default-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-# ubuntu-1604-master-py3: {extends: '.test_instance'}
+# passenger-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-8-master-py3: {extends: '.test_instance'}
+centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 # passenger-centos-8-master-py3: {extends: '.test_instance'}
 centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # passenger-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-33-master-py3: {extends: '.test_instance'}
+default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-# fedora-33-master-py3: {extends: '.test_instance'}
+# fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-32-master-py3: {extends: '.test_instance'}
+default-fedora-35-master-py3: {extends: '.test_instance'}
-# fedora-32-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'}
-# 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'}
-# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@ -168,60 +183,49 @@ default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 oraclelinux-8-master-py3: {extends: '.test_instance'}
 default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # oraclelinux-7-master-py3: {extends: '.test_instance'}
 default-arch-base-latest-master-py3: {extends: '.test_instance'}
 # arch-base-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3002-5-py3: {extends: '.test_instance'}
+# default-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-9-3002-5-py3: {extends: '.test_instance'}
+# passenger-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
+almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
+# passenger-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-8-3002-5-py3: {extends: '.test_instance'}
+rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-7-3002-5-py3: {extends: '.test_instance'}
+# default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-5-py3: {extends: '.test_instance'}
+# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-32-3002-5-py3: {extends: '.test_instance'}
+# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
+# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# arch-base-latest-3002-5-py3: {extends: '.test_instance'}
+# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
+# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
+# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3001-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# default-debian-9-3001-6-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
+# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-centos-8-3001-6-py3: {extends: '.test_instance'}
+# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-centos-7-3001-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-6-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-32-3001-6-py3: {extends: '.test_instance'}
+# default-debian-10-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
+# default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
+# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
+# default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-debian-10-3000-8-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-debian-9-3000-8-py3: {extends: '.test_instance'}
+# yamllint enable rule:line-length
 # default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
 # default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
 # default-centos-8-3000-8-py3: {extends: '.test_instance'}
 # default-centos-7-3000-8-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
 # default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
 # default-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
 ###############################################################################
 # `release` stage: `semantic-release`
--- a/.pre-commit-config.yaml
+++ b/.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,4 +64,14 @@ repos:
      - id: rstcheck
        name: Check reST files using rstcheck
        exclude: 'docs/CHANGELOG.rst'
-        args: [--report=warning]
+  - 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]
--- a/.rstcheck.cfg
+++ b/.rstcheck.cfg
@ -1,3 +1,4 @@
 [rstcheck]
-report=error
+report=info
 ignore_language=rst
 ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
--- a/.rubocop.yml
+++ b/.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`
--- a/.travis.yml
+++ b/.travis.yml
@ -83,42 +83,49 @@ 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-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=default-centos-stream8-tiamat-py3
    # - env: INSTANCE=default-centos-8-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=passenger-debian-11-master-py3
    - env: INSTANCE=debian-11-master-py3
    # - env: INSTANCE=default-debian-10-master-py3
    # - env: INSTANCE=passenger-debian-10-master-py3
    - env: INSTANCE=debian-10-master-py3
    # - env: INSTANCE=default-debian-9-master-py3
    # - env: INSTANCE=passenger-debian-9-master-py3
    - env: INSTANCE=debian-9-master-py3
    # - env: INSTANCE=default-ubuntu-2204-master-py3
    # - env: INSTANCE=passenger-ubuntu-2204-master-py3
    - env: INSTANCE=ubuntu-2204-master-py3
    # - env: INSTANCE=default-ubuntu-2004-master-py3
    # - env: INSTANCE=passenger-ubuntu-2004-master-py3
    - env: INSTANCE=ubuntu-2004-master-py3
    # - env: INSTANCE=default-ubuntu-1804-master-py3
    # - env: INSTANCE=passenger-ubuntu-1804-master-py3
    - env: INSTANCE=ubuntu-1804-master-py3
-    - env: INSTANCE=default-ubuntu-1604-master-py3
+    # - env: INSTANCE=default-centos-stream8-master-py3
-    # - env: INSTANCE=ubuntu-1604-master-py3
+    # - env: INSTANCE=passenger-centos-stream8-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=centos-stream8-master-py3
    # - env: INSTANCE=passenger-centos-8-master-py3
    - env: INSTANCE=centos-8-master-py3
    # - env: INSTANCE=default-centos-7-master-py3
    # - env: INSTANCE=passenger-centos-7-master-py3
    - env: INSTANCE=centos-7-master-py3
-    - env: INSTANCE=default-fedora-33-master-py3
+    - env: INSTANCE=default-fedora-36-master-py3
-    # - env: INSTANCE=fedora-33-master-py3
+    # - env: INSTANCE=fedora-36-master-py3
-    - env: INSTANCE=default-fedora-32-master-py3
+    - env: INSTANCE=default-fedora-35-master-py3
-    # - env: INSTANCE=fedora-32-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=opensuse-leap-152-master-py3
+    # - env: INSTANCE=opensuse-leap-153-master-py3
    - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
    # - env: INSTANCE=opensuse-tmbl-latest-master-py3
    - env: INSTANCE=default-amazonlinux-2-master-py3
@ -128,60 +135,48 @@ jobs:
    - env: INSTANCE=oraclelinux-8-master-py3
    - env: INSTANCE=default-oraclelinux-7-master-py3
    # - env: INSTANCE=oraclelinux-7-master-py3
    - env: INSTANCE=default-arch-base-latest-master-py3
    # - env: INSTANCE=arch-base-latest-master-py3
    # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
    # - env: INSTANCE=gentoo-stage3-latest-master-py3
    - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
    # - env: INSTANCE=gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-10-3002-5-py3
+    # - env: INSTANCE=default-almalinux-8-master-py3
-    # - env: INSTANCE=default-debian-9-3002-5-py3
+    # - env: INSTANCE=passenger-almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-5-py3
+    - env: INSTANCE=almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-5-py3
+    # - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-1604-3002-5-py3
+    # - env: INSTANCE=passenger-rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-8-3002-5-py3
+    - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-7-3002-5-py3
+    # - env: INSTANCE=default-debian-11-3004-1-py3
-    # - env: INSTANCE=default-fedora-33-3002-5-py3
+    # - env: INSTANCE=default-debian-10-3004-1-py3
-    # - env: INSTANCE=default-fedora-32-3002-5-py3
+    # - env: INSTANCE=default-debian-9-3004-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-5-py3
+    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-5-py3
+    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-5-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
-    - env: INSTANCE=default-arch-base-latest-3002-5-py3
+    # - env: INSTANCE=default-centos-stream8-3004-1-py3
-    # - env: INSTANCE=arch-base-latest-3002-5-py3
+    # - env: INSTANCE=default-centos-7-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
+    # - env: INSTANCE=default-fedora-36-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
+    # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=default-debian-10-3001-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
-    # - env: INSTANCE=default-debian-9-3001-6-py3
+    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1604-3001-6-py3
+    # - env: INSTANCE=default-almalinux-8-3004-1-py3
-    # - env: INSTANCE=default-centos-8-3001-6-py3
+    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
-    # - env: INSTANCE=default-centos-7-3001-6-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-fedora-33-3001-6-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=default-fedora-32-3001-6-py3
+    # - env: INSTANCE=default-debian-10-3003-4-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-6-py3
+    # - env: INSTANCE=default-debian-9-3003-4-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-6-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-6-py3
+    # - env: INSTANCE=default-centos-stream8-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-6-py3
+    # - env: INSTANCE=default-centos-7-3003-4-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-6-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=default-debian-10-3000-8-py3
+    # - env: INSTANCE=default-almalinux-8-3003-4-py3
    # - env: INSTANCE=default-debian-9-3000-8-py3
    # - env: INSTANCE=default-ubuntu-1804-3000-8-py3
    # - env: INSTANCE=default-ubuntu-1604-3000-8-py3
    # - env: INSTANCE=default-centos-8-3000-8-py3
    # - env: INSTANCE=default-centos-7-3000-8-py3
    # - env: INSTANCE=default-opensuse-leap-152-3000-8-py3
    # - env: INSTANCE=default-amazonlinux-2-3000-8-py3
    # - env: INSTANCE=default-oraclelinux-8-3000-8-py3
    # - env: INSTANCE=default-oraclelinux-7-3000-8-py3
    # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
    # - env: INSTANCE=default-ubuntu-1804-3000-8-py2
    # - env: INSTANCE=default-ubuntu-1604-3000-8-py2
    # - env: INSTANCE=default-arch-base-latest-3000-8-py2
    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/.yamllint
+++ b/.yamllint
@ -5,17 +5,21 @@
 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. 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/
  test/**/states/**/*.sls
  .kitchen/
  kitchen.vagrant.yml
  test/salt/passenger/pillar/nginx.sls
 yaml-files:
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -4,13 +4,13 @@ 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)|96
+<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)|155
 <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)|46
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|29
 <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)|27
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|24
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|18
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|19
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|17
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|14
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>|[@ross-p](https://github.com/ross-p)|13
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|11
 <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
@ -47,7 +47,6 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2200073?v=4' width='36' height='36' alt='@kmshultz'>|[@kmshultz](https://github.com/kmshultz)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/11417?v=4' width='36' height='36' alt='@malept'>|[@malept](https://github.com/malept)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3279679?v=4' width='36' height='36' alt='@meganlkm'>|[@meganlkm](https://github.com/meganlkm)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>|[@garrettw](https://github.com/garrettw)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/101513?v=4' width='36' height='36' alt='@ErisDS'>|[@ErisDS](https://github.com/ErisDS)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/879922?v=4' width='36' height='36' alt='@myoung34'>|[@myoung34](https://github.com/myoung34)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|2
@ -64,16 +63,18 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/72727?v=4' width='36' height='36' alt='@czarneckid'>|[@czarneckid](https://github.com/czarneckid)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/983?v=4' width='36' height='36' alt='@statik'>|[@statik](https://github.com/statik)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/48329?v=4' width='36' height='36' alt='@ekristen'>|[@ekristen](https://github.com/ekristen)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>|[@garrettw](https://github.com/garrettw)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/75496?v=4' width='36' height='36' alt='@jeduardo'>|[@jeduardo](https://github.com/jeduardo)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/668449?v=4' width='36' height='36' alt='@stromnet'>|[@stromnet](https://github.com/stromnet)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/744549?v=4' width='36' height='36' alt='@bsdlp'>|[@bsdlp](https://github.com/bsdlp)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/350294?v=4' width='36' height='36' alt='@anderbubble'>|[@anderbubble](https://github.com/anderbubble)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5395035?v=4' width='36' height='36' alt='@MEschenbacher'>|[@MEschenbacher](https://github.com/MEschenbacher)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/225115?v=4' width='36' height='36' alt='@renich'>|[@renich](https://github.com/renich)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/62993?v=4' width='36' height='36' alt='@outime'>|[@outime](https://github.com/outime)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/991850?v=4' width='36' height='36' alt='@scub'>|[@scub](https://github.com/scub)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>|[@thatch45](https://github.com/thatch45)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/479088?v=4' width='36' height='36' alt='@blarghmatey'>|[@blarghmatey](https://github.com/blarghmatey)|1
-<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)|1
+<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)|1
 <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)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/19428823?v=4' width='36' height='36' alt='@francesco-a'>|[@francesco-a](https://github.com/francesco-a)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1068764?v=4' width='36' height='36' alt='@oboyle'>|[@oboyle](https://github.com/oboyle)|1
@ -81,4 +82,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-04-03.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-03-02.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,136 @@
 # Changelog
 ## [2.8.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.8.0...v2.8.1) (2022-03-02)
 ### Bug Fixes
 * **debian:** avoid adding repositories entries multiple times ([d1d3e55](https://github.com/saltstack-formulas/nginx-formula/commit/d1d3e552adf3bc17265ffcc1c27920d4b9a09c6d)), closes [/github.com/saltstack/salt/issues/59785#issuecomment-826590482](https://github.com//github.com/saltstack/salt/issues/59785/issues/issuecomment-826590482)
 ### Continuous Integration
 * update linters to latest versions [skip ci] ([512fe00](https://github.com/saltstack-formulas/nginx-formula/commit/512fe00a069f2fcabed119c36f9444c2a65e179c))
 ### Tests
 * **repository:** use `system.platform[:codename]` [skip ci] ([0e51694](https://github.com/saltstack-formulas/nginx-formula/commit/0e51694c2a59b975be0fe4972c525b73f556a6db))
 * **system:** add `build_platform_codename` [skip ci] ([5f1a289](https://github.com/saltstack-formulas/nginx-formula/commit/5f1a289f11cdcbb2dac6021109cfc390068134d4))
 # [2.8.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.5...v2.8.0) (2022-02-03)
 ### Code Refactoring
 * **pkgs:** readbility ([b76e8cc](https://github.com/saltstack-formulas/nginx-formula/commit/b76e8cc6640943d97bc778948555ae3f45a71552))
 ### Continuous Integration
 * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([7fcb960](https://github.com/saltstack-formulas/nginx-formula/commit/7fcb9608cd838469e7c1faf2126ea8d5673d0481))
 ### Features
 * **debian:** use keyrings instead of key_ids ([037c13a](https://github.com/saltstack-formulas/nginx-formula/commit/037c13a674d9e2850a808bcb0fe8600e4ec8b177))
 ### Reverts
 * **pkg:** use grains.osfinger in a format suitable for all platforms ([8fee9f0](https://github.com/saltstack-formulas/nginx-formula/commit/8fee9f05bd86c549a050a5b4c555fa0d532493d3))
 ### Styles
 * **map.jinja:** remove empty line ([ae52641](https://github.com/saltstack-formulas/nginx-formula/commit/ae52641cfc87ad576f22f0675eff436ebccf3d34))
 ### Tests
 * **repository:** favor `platform` over `os` ([c16ecf8](https://github.com/saltstack-formulas/nginx-formula/commit/c16ecf82f52b0236a8b54b5ad984c08902b79534))
 ## [2.7.5](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.4...v2.7.5) (2022-02-02)
 ### Bug Fixes
 * **snippets:** make sure they're deployed before being used ([9dfc1c1](https://github.com/saltstack-formulas/nginx-formula/commit/9dfc1c1b2f4a0cd17221b303c95af1d7a9aba781))
 ### Continuous Integration
 * **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([6a42a9b](https://github.com/saltstack-formulas/nginx-formula/commit/6a42a9bdf84e764cb4b3313ad2b6d95688517dec))
 * **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([860fabe](https://github.com/saltstack-formulas/nginx-formula/commit/860fabe327cfa9512152b0f278897311f35449bf))
 * **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([1557473](https://github.com/saltstack-formulas/nginx-formula/commit/155747346c5b0fe7e1af5214734581e992832b45))
 * **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([a11da83](https://github.com/saltstack-formulas/nginx-formula/commit/a11da83d03fad1c50a93ba06c1c5af21f1c79e7a))
 * **gitlab-ci:** enable instance after upstream issue resolved [skip ci] ([79499e8](https://github.com/saltstack-formulas/nginx-formula/commit/79499e841be74162dd5ec869de267366b6048af1))
 * **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([6b65017](https://github.com/saltstack-formulas/nginx-formula/commit/6b650177aaa9800151f2e7f628551856f0c28c54))
 * **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([30f87cc](https://github.com/saltstack-formulas/nginx-formula/commit/30f87cc84b2991c7f0ed1f0066f9241a3754e8df))
 * **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([70a1f31](https://github.com/saltstack-formulas/nginx-formula/commit/70a1f3135ccfde09f6016a46eee3fc55b2ca9840))
 * **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([e041418](https://github.com/saltstack-formulas/nginx-formula/commit/e0414181a724076176cb37f6402f013f4e498109))
 * **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] ([7deb74f](https://github.com/saltstack-formulas/nginx-formula/commit/7deb74fdbccad7e8590b9ddf7d0630e9a2ba56e1))
 * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([fa8a5db](https://github.com/saltstack-formulas/nginx-formula/commit/fa8a5db5079b1e41eeac5d4ee25c06d976a24f3e))
 * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([d15f3de](https://github.com/saltstack-formulas/nginx-formula/commit/d15f3decb3fb1d8d1d04934c8d909913380d53f1))
 ## [2.7.4](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.3...v2.7.4) (2021-06-15)
 ### Bug Fixes
 * **servers:** include main config file watch in extend ([00387e7](https://github.com/saltstack-formulas/nginx-formula/commit/00387e7cbd90ceb5496df5cf9bce8f7dae25b056))
 ## [2.7.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.2...v2.7.3) (2021-06-14)
 ### Tests
 * **snippets:** add tests for snippets includes ([1c83b6d](https://github.com/saltstack-formulas/nginx-formula/commit/1c83b6d5fa93079476ca9e8baa1ccd9d44e5237f)), closes [#275](https://github.com/saltstack-formulas/nginx-formula/issues/275) [#274](https://github.com/saltstack-formulas/nginx-formula/issues/274)
 ## [2.7.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.1...v2.7.2) (2021-06-14)
 ### Bug Fixes
 * **certificates:** ensure `openssl` installed before `cmd.run` ([0cd7c7b](https://github.com/saltstack-formulas/nginx-formula/commit/0cd7c7b20528ce9fbd4f8991a365415a3093546d)), closes [/gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830](https://github.com//gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819/issues/L2830)
 * **snippets:** ignore servers or snippets when undefined ([6cb486d](https://github.com/saltstack-formulas/nginx-formula/commit/6cb486dbd290c91bbdbf00fd0061efaedbef4dea)), closes [#274](https://github.com/saltstack-formulas/nginx-formula/issues/274)
 ## [2.7.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.0...v2.7.1) (2021-05-12)
 ### Bug Fixes
 * **servers:** wrong conditional specification ([494b2fb](https://github.com/saltstack-formulas/nginx-formula/commit/494b2fbea490fded02cecd4d3e3e0372476548fb))
 ### Continuous Integration
 * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([4697152](https://github.com/saltstack-formulas/nginx-formula/commit/46971528d7a7e23241564da146ee8d28b7d2eecc))
 # [2.7.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.3...v2.7.0) (2021-04-28)
 ### Continuous Integration
 * **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([46faf4e](https://github.com/saltstack-formulas/nginx-formula/commit/46faf4e24b39f7d4fd138126dbe5eb6a06eb5b67))
 * **vagrant:** add FreeBSD 13.0 [skip ci] ([b41062e](https://github.com/saltstack-formulas/nginx-formula/commit/b41062e3b19c4c109198bd95c53158d871bbff85))
 * **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([b9e9cd3](https://github.com/saltstack-formulas/nginx-formula/commit/b9e9cd38e6d29b7eb4cd8ae74a1bdf901959dee3))
 ### Documentation
 * **readme:** add `Testing with Vagrant` section [skip ci] ([5727848](https://github.com/saltstack-formulas/nginx-formula/commit/57278481de489441a5c04aee544962212e91c5af))
 ### Features
 * **servers_config:** add require statement to manage dependencies ([622d22f](https://github.com/saltstack-formulas/nginx-formula/commit/622d22f9711085aeca19f3907e22e87c6b21b8d0))
 ### Tests
 * **requires:** verify dependencies in vhosts ([6478143](https://github.com/saltstack-formulas/nginx-formula/commit/64781431b9187d392f56ce5461c3b1a9c2944f90))
 ## [2.6.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.2...v2.6.3) (2021-04-03)
--- a/3
+++ b/3
@ -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
@ -39,6 +40,8 @@
 /Gemfile                                    @saltstack-formulas/ssf
 /Gemfile.lock                               @saltstack-formulas/ssf
 /kitchen.yml                                @saltstack-formulas/ssf
 /kitchen.vagrant.yml                        @saltstack-formulas/ssf
 /kitchen.windows.yml                        @saltstack-formulas/ssf
 /pre-commit_semantic-release.sh             @saltstack-formulas/ssf
 /release-rules.js                           @saltstack-formulas/ssf
 /release.config.js                          @saltstack-formulas/ssf
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 name: nginx
 os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE
 os_family: Debian, RedHat, Suse
-version: 2.6.3
+version: 2.8.1
 release: 1
 minimum_version: 2017.3
 summary: nginx formula
--- a/21
+++ b/21
@ -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'
--- a/Gemfile.lock
+++ b/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
--- a/bin/kitchen
+++ b/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
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@ -15,10 +15,13 @@ 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>`_
-     - 96
+     - 155
   * - :raw-html-m2r:`<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>`_
     - 46
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
     - `@javierbertoli <https://github.com/javierbertoli>`_
     - 29
   * - :raw-html-m2r:`<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>`_
     - 27
@ -27,13 +30,10 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - 24
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 18
+     - 19
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>`
     - `@whiteinge <https://github.com/whiteinge>`_
     - 17
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
     - `@javierbertoli <https://github.com/javierbertoli>`_
     - 14
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>`
     - `@ross-p <https://github.com/ross-p>`_
     - 13
@ -142,9 +142,6 @@ 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/3279679?v=4' width='36' height='36' alt='@meganlkm'>`
     - `@meganlkm <https://github.com/meganlkm>`_
     - 2
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>`
     - `@garrettw <https://github.com/garrettw>`_
     - 2
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/101513?v=4' width='36' height='36' alt='@ErisDS'>`
     - `@ErisDS <https://github.com/ErisDS>`_
     - 2
@ -193,6 +190,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/48329?v=4' width='36' height='36' alt='@ekristen'>`
     - `@ekristen <https://github.com/ekristen>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>`
     - `@garrettw <https://github.com/garrettw>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/75496?v=4' width='36' height='36' alt='@jeduardo'>`
     - `@jeduardo <https://github.com/jeduardo>`_
     - 1
@ -202,6 +202,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/744549?v=4' width='36' height='36' alt='@bsdlp'>`
     - `@bsdlp <https://github.com/bsdlp>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/350294?v=4' width='36' height='36' alt='@anderbubble'>`
     - `@anderbubble <https://github.com/anderbubble>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5395035?v=4' width='36' height='36' alt='@MEschenbacher'>`
     - `@MEschenbacher <https://github.com/MEschenbacher>`_
     - 1
@ -220,8 +223,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/479088?v=4' width='36' height='36' alt='@blarghmatey'>`
     - `@blarghmatey <https://github.com/blarghmatey>`_
     - 1
-   * - :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>`_
     - 1
   * - :raw-html-m2r:`<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>`_
@ -239,4 +242,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-04-03.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-03-02.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@ -2,6 +2,165 @@
 Changelog
 =========
 `2.8.1 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.8.0...v2.8.1>`_ (2022-03-02)
 -------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **debian:** avoid adding repositories entries multiple times (\ `d1d3e55 <https://github.com/saltstack-formulas/nginx-formula/commit/d1d3e552adf3bc17265ffcc1c27920d4b9a09c6d>`_\ ), closes `/github.com/saltstack/salt/issues/59785#issuecomment-826590482 <https://github.com//github.com/saltstack/salt/issues/59785/issues/issuecomment-826590482>`_
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * update linters to latest versions [skip ci] (\ `512fe00 <https://github.com/saltstack-formulas/nginx-formula/commit/512fe00a069f2fcabed119c36f9444c2a65e179c>`_\ )
 Tests
 ^^^^^
 * **repository:** use ``system.platform[:codename]`` [skip ci] (\ `0e51694 <https://github.com/saltstack-formulas/nginx-formula/commit/0e51694c2a59b975be0fe4972c525b73f556a6db>`_\ )
 * **system:** add ``build_platform_codename`` [skip ci] (\ `5f1a289 <https://github.com/saltstack-formulas/nginx-formula/commit/5f1a289f11cdcbb2dac6021109cfc390068134d4>`_\ )
 `2.8.0 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.5...v2.8.0>`_ (2022-02-03)
 -------------------------------------------------------------------------------------------------------
 Code Refactoring
 ^^^^^^^^^^^^^^^^
 * **pkgs:** readbility (\ `b76e8cc <https://github.com/saltstack-formulas/nginx-formula/commit/b76e8cc6640943d97bc778948555ae3f45a71552>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `7fcb960 <https://github.com/saltstack-formulas/nginx-formula/commit/7fcb9608cd838469e7c1faf2126ea8d5673d0481>`_\ )
 Features
 ^^^^^^^^
 * **debian:** use keyrings instead of key_ids (\ `037c13a <https://github.com/saltstack-formulas/nginx-formula/commit/037c13a674d9e2850a808bcb0fe8600e4ec8b177>`_\ )
 Reverts
 ^^^^^^^
 * **pkg:** use grains.osfinger in a format suitable for all platforms (\ `8fee9f0 <https://github.com/saltstack-formulas/nginx-formula/commit/8fee9f05bd86c549a050a5b4c555fa0d532493d3>`_\ )
 Styles
 ^^^^^^
 * **map.jinja:** remove empty line (\ `ae52641 <https://github.com/saltstack-formulas/nginx-formula/commit/ae52641cfc87ad576f22f0675eff436ebccf3d34>`_\ )
 Tests
 ^^^^^
 * **repository:** favor ``platform`` over ``os`` (\ `c16ecf8 <https://github.com/saltstack-formulas/nginx-formula/commit/c16ecf82f52b0236a8b54b5ad984c08902b79534>`_\ )
 `2.7.5 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.4...v2.7.5>`_ (2022-02-02)
 -------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **snippets:** make sure they're deployed before being used (\ `9dfc1c1 <https://github.com/saltstack-formulas/nginx-formula/commit/9dfc1c1b2f4a0cd17221b303c95af1d7a9aba781>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `6a42a9b <https://github.com/saltstack-formulas/nginx-formula/commit/6a42a9bdf84e764cb4b3313ad2b6d95688517dec>`_\ )
 * **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] (\ `860fabe <https://github.com/saltstack-formulas/nginx-formula/commit/860fabe327cfa9512152b0f278897311f35449bf>`_\ )
 * **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `1557473 <https://github.com/saltstack-formulas/nginx-formula/commit/155747346c5b0fe7e1af5214734581e992832b45>`_\ )
 * **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `a11da83 <https://github.com/saltstack-formulas/nginx-formula/commit/a11da83d03fad1c50a93ba06c1c5af21f1c79e7a>`_\ )
 * **gitlab-ci:** enable instance after upstream issue resolved [skip ci] (\ `79499e8 <https://github.com/saltstack-formulas/nginx-formula/commit/79499e841be74162dd5ec869de267366b6048af1>`_\ )
 * **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `6b65017 <https://github.com/saltstack-formulas/nginx-formula/commit/6b650177aaa9800151f2e7f628551856f0c28c54>`_\ )
 * **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `30f87cc <https://github.com/saltstack-formulas/nginx-formula/commit/30f87cc84b2991c7f0ed1f0066f9241a3754e8df>`_\ )
 * **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `70a1f31 <https://github.com/saltstack-formulas/nginx-formula/commit/70a1f3135ccfde09f6016a46eee3fc55b2ca9840>`_\ )
 * **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `e041418 <https://github.com/saltstack-formulas/nginx-formula/commit/e0414181a724076176cb37f6402f013f4e498109>`_\ )
 * **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] (\ `7deb74f <https://github.com/saltstack-formulas/nginx-formula/commit/7deb74fdbccad7e8590b9ddf7d0630e9a2ba56e1>`_\ )
 * add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `fa8a5db <https://github.com/saltstack-formulas/nginx-formula/commit/fa8a5db5079b1e41eeac5d4ee25c06d976a24f3e>`_\ )
 * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `d15f3de <https://github.com/saltstack-formulas/nginx-formula/commit/d15f3decb3fb1d8d1d04934c8d909913380d53f1>`_\ )
 `2.7.4 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.3...v2.7.4>`_ (2021-06-15)
 -------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **servers:** include main config file watch in extend (\ `00387e7 <https://github.com/saltstack-formulas/nginx-formula/commit/00387e7cbd90ceb5496df5cf9bce8f7dae25b056>`_\ )
 `2.7.3 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.2...v2.7.3>`_ (2021-06-14)
 -------------------------------------------------------------------------------------------------------
 Tests
 ^^^^^
 * **snippets:** add tests for snippets includes (\ `1c83b6d <https://github.com/saltstack-formulas/nginx-formula/commit/1c83b6d5fa93079476ca9e8baa1ccd9d44e5237f>`_\ ), closes `#275 <https://github.com/saltstack-formulas/nginx-formula/issues/275>`_ `#274 <https://github.com/saltstack-formulas/nginx-formula/issues/274>`_
 `2.7.2 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.1...v2.7.2>`_ (2021-06-14)
 -------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **certificates:** ensure ``openssl`` installed before ``cmd.run`` (\ `0cd7c7b <https://github.com/saltstack-formulas/nginx-formula/commit/0cd7c7b20528ce9fbd4f8991a365415a3093546d>`_\ ), closes `/gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830 <https://github.com//gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819/issues/L2830>`_
 * **snippets:** ignore servers or snippets when undefined (\ `6cb486d <https://github.com/saltstack-formulas/nginx-formula/commit/6cb486dbd290c91bbdbf00fd0061efaedbef4dea>`_\ ), closes `#274 <https://github.com/saltstack-formulas/nginx-formula/issues/274>`_
 `2.7.1 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.0...v2.7.1>`_ (2021-05-12)
 -------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **servers:** wrong conditional specification (\ `494b2fb <https://github.com/saltstack-formulas/nginx-formula/commit/494b2fbea490fded02cecd4d3e3e0372476548fb>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `4697152 <https://github.com/saltstack-formulas/nginx-formula/commit/46971528d7a7e23241564da146ee8d28b7d2eecc>`_\ )
 `2.7.0 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.3...v2.7.0>`_ (2021-04-28)
 -------------------------------------------------------------------------------------------------------
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `46faf4e <https://github.com/saltstack-formulas/nginx-formula/commit/46faf4e24b39f7d4fd138126dbe5eb6a06eb5b67>`_\ )
 * **vagrant:** add FreeBSD 13.0 [skip ci] (\ `b41062e <https://github.com/saltstack-formulas/nginx-formula/commit/b41062e3b19c4c109198bd95c53158d871bbff85>`_\ )
 * **vagrant:** use pre-salted boxes & conditional local settings [skip ci] (\ `b9e9cd3 <https://github.com/saltstack-formulas/nginx-formula/commit/b9e9cd38e6d29b7eb4cd8ae74a1bdf901959dee3>`_\ )
 Documentation
 ^^^^^^^^^^^^^
 * **readme:** add ``Testing with Vagrant`` section [skip ci] (\ `5727848 <https://github.com/saltstack-formulas/nginx-formula/commit/57278481de489441a5c04aee544962212e91c5af>`_\ )
 Features
 ^^^^^^^^
 * **servers_config:** add require statement to manage dependencies (\ `622d22f <https://github.com/saltstack-formulas/nginx-formula/commit/622d22f9711085aeca19f3907e22e87c6b21b8d0>`_\ )
 Tests
 ^^^^^
 * **requires:** verify dependencies in vhosts (\ `6478143 <https://github.com/saltstack-formulas/nginx-formula/commit/64781431b9187d392f56ce5461c3b1a9c2944f90>`_\ )
 `2.6.3 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.2...v2.6.3>`_ (2021-04-03)
 -------------------------------------------------------------------------------------------------------
--- a/docs/README.apt.keyrings.rst
+++ b/docs/README.apt.keyrings.rst
@ -0,0 +1,34 @@
 .. _readme_apt_keyrings:
 apt repositories' keyrings
 ==========================
 Debian family of OSes deprecated the use of `apt-key` to manage repositories' keys
 in favor of using `keyring files` which contain a binary OpenPGP format of the key
 (also known as "GPG key public ring")
 As nginx and passenger don't provide such key files, we created them following the
 official recomendations in their sites and install the resulting files.
 Nginx
 -----
 See https://nginx.org/en/linux_packages.html#Debian for details
 .. code-block:: bash
   $ curl -s https://nginx.org/keys/nginx_signing.key | \
       gpg --dearmor --output nginx-archive-keyring.gpg
 Phusion-passenger
 -----------------
 See https://www.phusionpassenger.com/docs/tutorials/deploy_to_production/installations/oss/ownserver/ruby/nginx/
 for more details.
 .. code-block:: bash
   $ gpg --keyserver keyserver.ubuntu.com \
         --output - \
         --recv-keys 561F9B9CAC40B2F7 | \
     gpg --export --output phusionpassenger-archive-keyring.gpg
--- a/docs/README.rst
+++ b/docs/README.rst
@ -169,3 +169,65 @@ Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``veri
 ^^^^^^^^^^^^^^^^^^^^^
 Gives you SSH access to the instance for manual testing.
 Testing with Vagrant
 --------------------
 Windows/FreeBSD/OpenBSD testing is done with ``kitchen-salt``.
 Requirements
 ^^^^^^^^^^^^
 * Ruby
 * Virtualbox
 * Vagrant
 Setup
 ^^^^^
 .. code-block:: bash
   $ gem install bundler
   $ bundle install --with=vagrant
   $ bin/kitchen test [platform]
 Where ``[platform]`` is the platform name defined in ``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:
 .. code-block:: bash
   $ KITCHEN_LOCAL_YAML=kitchen.vagrant.yml bin/kitchen test      # Alternatively,
   $ export KITCHEN_LOCAL_YAML=kitchen.vagrant.yml
   $ bin/kitchen test
 Then run the following commands as needed.
 ``bin/kitchen converge``
 ^^^^^^^^^^^^^^^^^^^^^^^^
 Creates the Vagrant instance and runs the ``nginx`` main state, ready for testing.
 ``bin/kitchen verify``
 ^^^^^^^^^^^^^^^^^^^^^^
 Runs the ``inspec`` tests on the actual instance.
 ``bin/kitchen destroy``
 ^^^^^^^^^^^^^^^^^^^^^^^
 Removes the Vagrant instance.
 ``bin/kitchen test``
 ^^^^^^^^^^^^^^^^^^^^
 Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``verify`` + ``destroy``.
 ``bin/kitchen login``
 ^^^^^^^^^^^^^^^^^^^^^
 Gives you RDP/SSH access to the instance for manual testing.
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@ -7,17 +7,26 @@ driver:
  customize:
    usbxhci: 'off'
  gui: false
  linked_clone: true
  ssh:
    shell: /bin/sh
  linked_clone: true
  <% unless ENV['CI'] %>
  synced_folders:
    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
      - '/vagrant'
      - 'create: true, disabled: false'
  <% end %>
 platforms:
-  - name: freebsd-122-latest-py3
+  - name: freebsd-130-master-py3
    driver:
-      box: bento/freebsd-12.2
+      box: myii/freebsd-13.0-master-py3
-  - name: freebsd-114-latest-py3
+  - name: freebsd-123-master-py3
    driver:
-      box: bento/freebsd-11.4
+      box: myii/freebsd-12.3-master-py3
-
+  - name: freebsd-130-3004-0-py3
-provisioner:
+    driver:
-  salt_install: bootstrap
+      box: myii/freebsd-13.0-3004.0-py3
  - name: freebsd-123-3004-0-py3
    driver:
      box: myii/freebsd-12.3-3004.0-py3
--- a/kitchen.yml
+++ b/kitchen.yml
@ -6,28 +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: nginx
  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: ubuntu-1604-tiamat-py3
+      run_command: /lib/systemd/systemd
  - name: centos-stream8-tiamat-py3
    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-16.04
+      image: saltimages/salt-tiamat-py3:centos-stream8
  - name: centos-8-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:centos-8
  - name: centos-7-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:centos-7
@ -40,47 +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: ubuntu-1604-master-py3
+      run_command: /lib/systemd/systemd
  - name: centos-stream8-master-py3
    driver:
-      image: saltimages/salt-master-py3:ubuntu-16.04
+      image: saltimages/salt-master-py3:centos-stream8
  - name: centos-8-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-8
  - name: centos-7-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-7
-  - name: fedora-33-master-py3
+  - name: fedora-36-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-33
+      image: saltimages/salt-master-py3:fedora-36
-  - name: fedora-32-master-py3
+  - name: fedora-35-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-32
+      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:
@ -94,6 +126,9 @@ platforms:
  - name: oraclelinux-7-master-py3
    driver:
      image: saltimages/salt-master-py3:oraclelinux-7
  - name: arch-base-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:arch-base-latest
  - name: gentoo-stage3-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:gentoo-stage3-latest
@ -101,217 +136,146 @@ 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 `3002.5`
+  ## SALT `3004.1`
-  - name: debian-10-3002-5-py3
+  - name: debian-11-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:debian-10
+      image: saltimages/salt-3004.1-py3:debian-11
-  - name: debian-9-3002-5-py3
+      run_command: /lib/systemd/systemd
  - name: debian-10-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:debian-9
+      image: saltimages/salt-3004.1-py3:debian-10
-  - name: ubuntu-2004-3002-5-py3
+      run_command: /lib/systemd/systemd
  - name: debian-9-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-20.04
+      image: saltimages/salt-3004.1-py3:debian-9
-  - name: ubuntu-1804-3002-5-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2204-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-18.04
+      image: saltimages/salt-3004.1-py3:ubuntu-22.04
-  - name: ubuntu-1604-3002-5-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-16.04
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
-  - name: centos-8-3002-5-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:centos-8
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-  - name: centos-7-3002-5-py3
+      run_command: /lib/systemd/systemd
  - name: centos-stream8-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:centos-7
+      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: fedora-33-3002-5-py3
+  - name: centos-7-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:fedora-33
+      image: saltimages/salt-3004.1-py3:centos-7
-  - name: fedora-32-3002-5-py3
+  - name: fedora-36-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:fedora-32
+      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: amazonlinux-2-3002-5-py3
+  - name: fedora-35-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:amazonlinux-2
+      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: oraclelinux-8-3002-5-py3
+  - name: amazonlinux-2-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-8
+      image: saltimages/salt-3004.1-py3:amazonlinux-2
-  - name: oraclelinux-7-3002-5-py3
+  - name: oraclelinux-8-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-7
+      image: saltimages/salt-3004.1-py3:oraclelinux-8
-  - name: arch-base-latest-3002-5-py3
+  - name: oraclelinux-7-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:arch-base-latest
+      image: saltimages/salt-3004.1-py3:oraclelinux-7
-      run_command: /usr/lib/systemd/systemd
+  - name: arch-base-latest-3004-1-py3
  - name: gentoo-stage3-latest-3002-5-py3
    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
+      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-3002-5-py3
+  - name: gentoo-stage3-systemd-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-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.2`
+  ## SALT `3004.0`
-  - name: opensuse-leap-152-3002-2-py3
+  - name: opensuse-leap-153-3004-0-py3
    driver:
-      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
+      image: saltimages/salt-3004.0-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-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.6`
+  ## SALT `3003.4`
-  - name: debian-10-3001-6-py3
+  - name: debian-10-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:debian-10
+      image: saltimages/salt-3003.4-py3:debian-10
-  - name: debian-9-3001-6-py3
+      run_command: /lib/systemd/systemd
  - name: debian-9-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:debian-9
+      image: saltimages/salt-3003.4-py3:debian-9
-  - name: ubuntu-2004-3001-6-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-20.04
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-6-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-6-py3
+      run_command: /lib/systemd/systemd
  - name: centos-stream8-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-16.04
+      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-8-3001-6-py3
+  - name: centos-7-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:centos-8
+      image: saltimages/salt-3003.4-py3:centos-7
-  - name: centos-7-3001-6-py3
+  - name: amazonlinux-2-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:centos-7
+      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: fedora-33-3001-6-py3
+  - name: oraclelinux-8-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:fedora-33
+      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: fedora-32-3001-6-py3
+  - name: oraclelinux-7-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:fedora-32
+      image: saltimages/salt-3003.4-py3:oraclelinux-7
-  - name: opensuse-leap-152-3001-6-py3
+  - name: almalinux-8-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
+      image: saltimages/salt-3003.4-py3:almalinux-8
      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-3001-6-py3
    driver:
      image: saltimages/salt-3001.6-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
  - name: amazonlinux-2-3001-6-py3
    driver:
      image: saltimages/salt-3001.6-py3:amazonlinux-2
  - name: oraclelinux-8-3001-6-py3
    driver:
      image: saltimages/salt-3001.6-py3:oraclelinux-8
  - name: oraclelinux-7-3001-6-py3
    driver:
      image: saltimages/salt-3001.6-py3:oraclelinux-7
  - name: arch-base-latest-3001-6-py3
    driver:
      image: saltimages/salt-3001.6-py3:arch-base-latest
      run_command: /usr/lib/systemd/systemd
  - 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.8`
  - name: debian-10-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:debian-10
  - name: debian-9-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:debian-9
  - name: ubuntu-1804-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:ubuntu-18.04
  - name: ubuntu-1604-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:ubuntu-16.04
  - name: centos-8-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:centos-8
  - name: centos-7-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:centos-7
  - name: opensuse-leap-152-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-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-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:amazonlinux-2
  - name: oraclelinux-8-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:oraclelinux-8
  - name: oraclelinux-7-3000-8-py3
    driver:
      image: saltimages/salt-3000.8-py3:oraclelinux-7
  - 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
  - name: ubuntu-1804-3000-8-py2
    driver:
      image: saltimages/salt-3000.8-py2:ubuntu-18.04
  - name: ubuntu-1604-3000-8-py2
    driver:
      image: saltimages/salt-3000.8-py2:ubuntu-16.04
  - name: arch-base-latest-3000-8-py2
    driver:
      image: saltimages/salt-3000.8-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd
 provisioner:
  name: salt_solo
  log_level: debug
  salt_install: none
  require_chef: false
  formula: nginx
  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:
  - name: default
    provisioner:
      dependencies:
        - name: test_dep
          path: test/salt/default/states
      state_top:
        base:
          '*':
            - test_dep.create_dependency_file
            - nginx._mapdata
            - nginx
      pillars:
@ -326,41 +290,47 @@ suites:
        - path: test/integration/default
  - name: passenger
    includes:
      - debian-11-tiamat-py3
      - debian-10-tiamat-py3
      - debian-9-tiamat-py3
      - ubuntu-2204-tiamat-py3
      - ubuntu-2004-tiamat-py3
      - ubuntu-1804-tiamat-py3
-      - centos-8-tiamat-py3
+      - centos-stream8-tiamat-py3
      - centos-7-tiamat-py3
      - oraclelinux-8-tiamat-py3
      - almalinux-8-tiamat-py3
      - rockylinux-8-tiamat-py3
      - debian-11-master-py3
      - debian-10-master-py3
      - debian-9-master-py3
      - ubuntu-2204-master-py3
      - ubuntu-2004-master-py3
      - ubuntu-1804-master-py3
-      - centos-8-master-py3
+      - centos-stream8-master-py3
      - centos-7-master-py3
      - oraclelinux-8-master-py3
-      - debian-10-3002-5-py3
+      - almalinux-8-master-py3
-      - debian-9-3002-5-py3
+      - rockylinux-8-master-py3
-      - ubuntu-2004-3002-5-py3
+      - debian-11-3004-1-py3
-      - ubuntu-1804-3002-5-py3
+      - debian-10-3004-1-py3
-      - centos-8-3002-5-py3
+      - debian-9-3004-1-py3
-      - centos-7-3002-5-py3
+      - ubuntu-2204-3004-1-py3
-      - oraclelinux-8-3002-5-py3
+      - ubuntu-2004-3004-1-py3
-      - debian-10-3001-6-py3
+      - ubuntu-1804-3004-1-py3
-      - debian-9-3001-6-py3
+      - centos-stream8-3004-1-py3
-      - ubuntu-2004-3001-6-py3
+      - centos-7-3004-1-py3
-      - ubuntu-1804-3001-6-py3
+      - oraclelinux-8-3004-1-py3
-      - centos-8-3001-6-py3
+      - almalinux-8-3004-1-py3
-      - centos-7-3001-6-py3
+      - rockylinux-8-3004-1-py3
-      - oraclelinux-8-3001-6-py3
+      - debian-10-3003-4-py3
-      - debian-10-3000-8-py3
+      - debian-9-3003-4-py3
-      - debian-9-3000-8-py3
+      - ubuntu-2004-3003-4-py3
-      - ubuntu-1804-3000-8-py3
+      - ubuntu-1804-3003-4-py3
-      - centos-8-3000-8-py3
+      - centos-stream8-3003-4-py3
-      - centos-7-3000-8-py3
+      - centos-7-3003-4-py3
-      - oraclelinux-8-3000-8-py3
+      - oraclelinux-8-3003-4-py3
-      - ubuntu-1804-3000-8-py2
+      - almalinux-8-3003-4-py3
    provisioner:
      state_top:
        base:
--- a/nginx/certificates.sls
+++ b/nginx/certificates.sls
@ -30,6 +30,7 @@ generate_nginx_dhparam_{{ dh_param }}_key:
    - creates: {{ certificates_path }}/{{ dh_param }}
    - require:
      - file: prepare_certificates_path_dir
      - pkg: generate_nginx_dhparam_{{ dh_param }}_key
    - watch_in:
      - service: nginx_service
 {%- endif %}
--- a/nginx/config.sls
+++ b/nginx/config.sls
@ -31,6 +31,3 @@ nginx_config:
    - context:
        config: {{ nginx.server.config|json(sort_keys=False) }}
 {% endif %}
 {% if nginx.check_config_before_apply %}
    - check_cmd: /usr/sbin/nginx -t -c
 {% endif %}
--- a/nginx/files/default/nginx-archive-keyring.gpg
+++ b/nginx/files/default/nginx-archive-keyring.gpg
--- a/nginx/files/default/phusionpassenger-archive-keyring.gpg
+++ b/nginx/files/default/phusionpassenger-archive-keyring.gpg
--- a/nginx/map.jinja
+++ b/nginx/map.jinja
@ -19,6 +19,8 @@
            'server_use_symlink': True,
            'pid_file': '/run/nginx.pid',
            'openssl_package': 'openssl',
            'package_repo_keyring': '/usr/share/keyrings/nginx-archive-keyring.gpg',
            'passenger_package_repo_keyring': '/usr/share/keyrings/phusionpassenger-archive-keyring.gpg',
        },
        'CentOS': {
            'package': 'nginx',
@ -70,7 +72,8 @@
            'server_use_symlink': False,
            'pid_file': '/run/nginx.pid',
            'gpg_check': True,
-            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_{{ grains.osrelease }}/repodata/repomd.xml.key',
+            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/{{ grains.osrelease }}/repodata/repomd.xml.key',
            'gpg_autoimport': True,
            'openssl_package': 'openssl',
        },
        'Arch': {
@ -113,6 +116,7 @@
    'install_from_ppa': False,
    'install_from_repo': False,
    'install_from_phusionpassenger': False,
    'install_from_opensuse_devel': False,
    'check_config_before_apply': False,
    'ppa_version': 'stable',
    'source_version': '1.10.0',
@ -121,7 +125,9 @@
        'opts': {},
    },
    'package': {
-        'opts': {},
+        'opts': {
            'refresh': True,
        },
    },
    'service': {
        'enable': True,
@ -148,7 +154,7 @@
                'include': [
                    'mime.types',
                    'conf.d/*.conf',
-                    'sites-enabled/*',
+                    'vhosts.d/*.conf',
                ],
            },
        },
--- a/nginx/passenger.sls
+++ b/nginx/passenger.sls
@ -20,6 +20,7 @@ include:
 passenger_install:
  pkg.installed:
    {{ sls_block(nginx.package.opts) }}
    - name: {{ nginx.lookup.passenger_package }}
    - require:
      - pkg: nginx_install
--- a/nginx/pkg.sls
+++ b/nginx/pkg.sls
@ -2,25 +2,40 @@
 #
 # Manages installation of nginx from pkg.
-{% from 'nginx/map.jinja' import nginx, sls_block with context %}
+{#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import nginx, sls_block with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 {%- if nginx.install_from_repo %}
  {% set from_official = true %}
  {% set from_ppa = false %}
  {% set from_phusionpassenger = false %}
  {% set from_opensuse_devel = false %}
 {% elif nginx.install_from_ppa %}
  {% set from_official = false %}
  {% set from_ppa = true %}
  {% set from_phusionpassenger = false %}
  {% set from_opensuse_devel = false %}
 {% elif nginx.install_from_phusionpassenger %}
  {% set from_official = false %}
  {% set from_ppa = false %}
  {% set from_phusionpassenger = true %}
  {% set from_opensuse_devel = false %}
 {% elif nginx.install_from_opensuse_devel %}
  {% set from_official = false %}
  {% set from_ppa = false %}
  {% set from_phusionpassenger = false %}
  {% set from_opensuse_devel = true %}
 {% else %}
  {% set from_official = false %}
  {% set from_ppa = false %}
  {% set from_phusionpassenger = false %}
  {% set from_opensuse_devel = false %}
 {%- endif %}
 {%- set resource_repo_managed = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
 nginx_install:
  pkg.installed:
    {{ sls_block(nginx.package.opts) }}
@ -33,19 +48,31 @@ nginx_install:
    - name: {{ nginx.lookup.package }}
    {% endif %}
-{% if salt['grains.get']('os_family') == 'Debian' %}
+{% if grains.os_family == 'Debian' %}
  {%- if from_official %}
 nginx_official_repo_keyring:
  file.managed:
    - name: {{ nginx.lookup.package_repo_keyring }}
    - source: {{ files_switch(['nginx-archive-keyring.gpg'],
                              lookup='nginx_official_repo_keyring'
                 )
              }}
    - require_in:
      - {{ resource_repo_managed }}: nginx_official_repo
  {%- endif %}
 nginx_official_repo:
-  pkgrepo:
+  file:
    {%- if from_official %}
    - managed
    {%- else %}
    - absent
    {%- endif %}
-    - humanname: nginx apt repo
+    - name: /etc/apt/sources.list.d/nginx-official-{{ grains.oscodename }}.list
-    - name: deb http://nginx.org/packages/{{ grains['os'].lower() }}/ {{ grains['oscodename'] }} nginx
+    - contents: >
-    - file: /etc/apt/sources.list.d/nginx-official-{{ grains['oscodename'] }}.list
+        deb [signed-by={{ nginx.lookup.package_repo_keyring }}]
-    - keyid: ABF5BD827BD9BF62
+        http://nginx.org/packages/{{ grains.os | lower }}/ {{ grains.oscodename }} nginx
-    - keyserver: keyserver.ubuntu.com
+
    - require_in:
      - pkg: nginx_install
    - watch_in:
@ -60,10 +87,10 @@ nginx_ppa_repo:
    {%- else %}
    - absent
    {%- endif %}
-    {% if salt['grains.get']('os') == 'Ubuntu' %}
+    {% if grains.os == 'Ubuntu' %}
    - ppa: nginx/{{ nginx.ppa_version }}
    {% else %}
-    - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main
+    - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu {{ grains.oscodename }} main
    - keyid: C300EE8C
    - keyserver: keyserver.ubuntu.com
    {% endif %}
@ -73,47 +100,72 @@ nginx_ppa_repo:
      - pkg: nginx_install
   {%- endif %}
  {%- if from_phusionpassenger %}
 nginx_phusionpassenger_repo_keyring:
  file.managed:
    - name: /usr/share/keyrings/phusionpassenger-archive-keyring.gpg
    - source: {{ files_switch(['phusionpassenger-archive-keyring.gpg'],
                              lookup='nginx_phusionpassenger_repo_keyring'
                 )
              }}
    - require_in:
      - {{ resource_repo_managed }}: nginx_phusionpassenger_repo
 # Remove the old repo file
 nginx_phusionpassenger_repo_remove:
  pkgrepo.absent:
    - name: deb http://nginx.org/packages/{{ grains.os |lower }}/ {{ grains.oscodename }} nginx
    - keyid: 561F9B9CAC40B2F7
    - require_in:
      - {{ resource_repo_managed }}: nginx_phusionpassenger_repo
  file.absent:
    - name: /etc/apt/sources.list.d/nginx-phusionpassenger-{{ grains.oscodename }}.list
    - require_in:
      - {{ resource_repo_managed }}: nginx_phusionpassenger_repo
  {%- endif %}
 nginx_phusionpassenger_repo:
-  pkgrepo:
+  file:
    {%- if from_phusionpassenger %}
    - managed
    {%- else %}
    - absent
    {%- endif %}
-    - humanname: nginx phusionpassenger repo
+    - name: /etc/apt/sources.list.d/phusionpassenger-official-{{ grains.oscodename }}.list
-    - name: deb https://oss-binaries.phusionpassenger.com/apt/passenger {{ grains['oscodename'] }} main
+    - contents: >
-    - file: /etc/apt/sources.list.d/nginx-phusionpassenger-{{ grains['oscodename'] }}.list
+        deb [signed-by={{ nginx.lookup.passenger_package_repo_keyring }}]
-    - keyid: 561F9B9CAC40B2F7
+        https://oss-binaries.phusionpassenger.com/apt/passenger {{ grains.oscodename }} main
-    - keyserver: keyserver.ubuntu.com
+
    - require_in:
      - pkg: nginx_install
    - watch_in:
      - pkg: nginx_install
 {% endif %}
-{% if salt['grains.get']('os_family') == 'Suse' or salt['grains.get']('os') == 'SUSE' %}
+{% if grains.os_family == 'Suse' or grains.os == 'SUSE' %}
 nginx_zypp_repo:
  pkgrepo:
    {%- if from_official %}
    - managed
    {%- else %}
    - absent
    {%- endif %}
    - name: server_http
    {%- if from_opensuse_devel %}
    - managed
    - humanname: server_http
-    - baseurl: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/'
+    - baseurl: 'http://download.opensuse.org/repositories/server:/http/{{ grains.osrelease }}/'
    - enabled: True
    - autorefresh: True
    - gpgcheck: {{ nginx.lookup.gpg_check }}
    - gpgkey: {{ nginx.lookup.gpg_key }}
    - gpgautoimport: {{ nginx.lookup.gpg_autoimport }}
    {%- else %}
    - absent
    {%- endif %}
    - require_in:
      - pkg: nginx_install
    - watch_in:
      - pkg: nginx_install
 {% endif %}
-{% if salt['grains.get']('os_family') == 'RedHat' %}
+{% if grains.os_family == 'RedHat' %}
-{%   if salt['grains.get']('osfinger', '') in ['Amazon Linux-2'] %}
+  {% if grains.get('osfinger', '') == 'Amazon Linux-2' %}
 nginx_epel_repo:
  pkgrepo.managed:
    - name: epel
@ -138,7 +190,7 @@ nginx_yum_repo:
    {%- endif %}
    - name: nginx
    - humanname: nginx repo
-    {%- if salt['grains.get']('os') == 'CentOS' %}
+    {%- if grains.os == 'CentOS' %}
    - baseurl: 'http://nginx.org/packages/centos/$releasever/$basearch/'
    {%- else %}
    - baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
--- a/nginx/servers.sls
+++ b/nginx/servers.sls
@ -22,7 +22,9 @@ extend:
    service:
      - reload: True
      - require:
        - file: nginx_config
        {{ file_requisites(server_states) }}
      - listen:
        - file: nginx_config
        {{ file_requisites(server_states) }}
 {% endif %}
--- a/nginx/servers_config.sls
+++ b/nginx/servers_config.sls
@ -10,8 +10,8 @@
 {% set server_states = [] %}
 {#- _nginx is a lightened copy of nginx map intended to passed in templates #}
 {%- set _nginx = nginx.copy() %}
-{%- do _nginx.pop('snippets') %}
+{%- do _nginx.pop('snippets') if nginx.snippets is defined %}
-{%- do _nginx.pop('servers') %}
+{%- do _nginx.pop('servers') if nginx.servers is defined %}
 # Simple path concatenation.
 # Needs work to make this function on windows.
@ -101,6 +101,7 @@ nginx_server_available_dir:
 # Managed enabled/disabled state for servers
 {% for server, settings in nginx.servers.managed.items() %}
 {% set server_enabled = settings.enabled | default(True) %}
 {% set conf_state_id = 'server_conf_' ~ loop.index0 %}
 {% if 'deleted' in settings and settings.deleted %}
 {{ conf_state_id }}:
@ -108,7 +109,7 @@ nginx_server_available_dir:
        - name: {{ server_curpath(server) }}
 {% do server_states.append(conf_state_id) %}
 {% else %}
-{% if settings.enabled == True %}
+{% if server_enabled == True %}
 {{ conf_state_id }}:
  file.managed:
    {{ sls_block(nginx.servers.managed_opts) }}
@ -123,6 +124,12 @@ nginx_server_available_dir:
      }}
    - makedirs: True
    - template: jinja
      {%- if 'requires' in settings %}
    - require:
        {%- for k, v in settings.requires.items() %}
      - {{ k }}: {{ v }}
        {%- endfor %}
      {%- endif %}
 {% if 'source_path' not in settings.config %}
    - context:
        config: {{ settings.config|json(sort_keys=False) }}
@ -136,7 +143,7 @@ nginx_server_available_dir:
 {% endif %}
 {% endif %}
-{% if settings.enabled != None %}
+{% if settings.enabled is defined and server_enabled != None %}
 {% set status_state_id = 'server_state_' ~ loop.index0 %}
 {%- set enabled_dir = path_join(server, nginx.servers.managed.get(server).get('enabled_dir', nginx.lookup.server_enabled)) -%}
 {%- set available_dir = path_join(server, nginx.servers.managed.get(server).get('available_dir', nginx.lookup.server_available)) -%}
@ -145,9 +152,9 @@ nginx_server_available_dir:
 {% if 'deleted' in settings and settings.deleted %}
 {{ manage_status(server, False, True) }}
 {% else %}
-{{ manage_status(server, settings.enabled, False) }}
+{{ manage_status(server, server_enabled, False) }}
 {% endif %}
-{% if settings.enabled == True %}
+{% if server_enabled == True %}
    - require:
      - file: {{ conf_state_id }}
 {% endif %}
--- a/nginx/service.sls
+++ b/nginx/service.sls
@ -42,3 +42,6 @@ nginx_service:
      {% else %}
      - pkg: nginx_install
      {% endif %}
 {% if nginx.check_config_before_apply %}
    - onlyif: /usr/sbin/nginx -t
 {% endif %}
--- a/nginx/snippets.sls
+++ b/nginx/snippets.sls
@ -8,8 +8,8 @@
 {#- _nginx is a lightened copy of nginx map intended to passed in templates #}
 {%- set _nginx = nginx.copy() %}
-{%- do _nginx.pop('snippets') %}
+{%- do _nginx.pop('snippets') if nginx.snippets is defined %}
-{%- do _nginx.pop('servers') %}
+{%- do _nginx.pop('servers') if nginx.servers is defined %}
 nginx_snippets_dir:
  file.directory:
@ -32,5 +32,7 @@ nginx_snippet_{{ snippet }}:
      - file: nginx_snippets_dir
    - require_in:
      - file: nginx_config
      - sls: nginx.servers
      - sls: nginx.servers_config
      - service: nginx_service
 {% endfor %}
--- a/pillar.example
+++ b/pillar.example
@ -24,6 +24,10 @@ nginx:
  # each build accordingly ( https://launchpad.net/~nginx )
  ppa_version: 'stable'
  # Use openSUSE devel (server:http) repository to install nginx.
  # If not set, the server_http repository will be removed if it exists.
  install_from_opensuse_devel: false
  # Source install
  source_version: '1.10.0'
  source_hash: ''
@ -198,10 +202,23 @@ nginx:
      # relative filename of server file
      # (defaults to '/etc/nginx/sites-available/mysite')
      mysite:
-        # may be true, false, or None where true is enabled, false, disabled,
+        # may be true, false, or None where true is enabled, false is disabled,
        # and None indicates no action
        # true without ".disabled" management if not specified
        enabled: true
        # This let's you add dependencies on other resources being applied for a
        # particular vhost
        # A common case is when you use this formula together with letsencrypt's,
        # validating through nginx: you need nginx running (to validate the vhost) but
        # can't have the ssl vhost up until the certificate is created (because it
        # won't exist and will make nginx fail to load the configuration)
        #
        # An example, when using LE to create the cert for 'some.host.domain':
        # requires:
        #   cmd: create-initial-cert-some.host.domain
        requires: {}
        # Remove the site config file shipped by nginx
        # (i.e. '/etc/nginx/sites-available/default' by default)
        # It also remove the symlink (if it is exists).
--- a/pre-commit_semantic-release.sh
+++ b/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
--- a/test/integration/default/controls/config.rb
+++ b/test/integration/default/controls/config.rb
@ -71,5 +71,16 @@ control 'Nginx configuration' do
      its('content') { should include 'try_files $uri $uri/ =404;' }
      its('content') { should include 'include snippets/letsencrypt.conf;' }
    end
    describe file "#{dir}/mysite_with_require" do
      it { should be_file }
      it { should be_owned_by file_owner }
      it { should be_grouped_into file_group }
      its('mode') { should cmp '0644' }
      its('content') { should include 'server_name with-deps;' }
      its('content') { should include 'listen 80;' }
      its('content') { should include 'index index.html index.htm;' }
      its('content') { should include 'location ~ .htm {' }
      its('content') { should include 'try_files $uri $uri/ =404;' }
    end
  end
 end
--- a/test/integration/default/controls/file.rb
+++ b/test/integration/default/controls/file.rb
@ -0,0 +1,9 @@
 # frozen_string_literal: true
 control 'Dependency test file' do
  title 'should exist'
  describe file('/tmp/created_to_test_dependencies') do
    it { should be_file }
  end
 end
--- a/test/integration/default/inspec.yml
+++ b/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
--- a/test/integration/passenger/controls/repository.rb
+++ b/test/integration/passenger/controls/repository.rb
@ -0,0 +1,37 @@
 # frozen_string_literal: true
 case platform.family
 when 'redhat'
  repo_file = '/etc/yum.repos.d/passenger.repo'
  repo_url = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'
 when 'debian'
  codename = system.platform[:codename]
  repo_keyring = '/usr/share/keyrings/phusionpassenger-archive-keyring.gpg'
  repo_file = "/etc/apt/sources.list.d/phusionpassenger-official-#{codename}.list"
  # rubocop:disable Layout/LineLength
  repo_url = "deb [signed-by=#{repo_keyring}] https://oss-binaries.phusionpassenger.com/apt/passenger #{codename} main"
  # rubocop:enable Layout/LineLength
 end
 control 'Phusion-passenger repository keyring' do
  title 'should be installed'
  only_if('Requirement for Debian family') do
    os.debian?
  end
  describe file(repo_keyring) do
    it { should exist }
    it { should be_owned_by 'root' }
    it { should be_grouped_into 'root' }
    its('mode') { should cmp '0644' }
  end
 end
 control 'Phusion-passenger repository' do
  impact 1
  title 'should be configured'
  describe file(repo_file) do
    its('content') { should include repo_url }
  end
 end
--- a/test/integration/passenger/inspec.yml
+++ b/test/integration/passenger/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
--- a/test/integration/share/inspec.yml
+++ b/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
--- a/test/integration/share/libraries/system.rb
+++ b/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
--- a/test/salt/default/pillar/nginx.sls
+++ b/test/salt/default/pillar/nginx.sls
@ -37,6 +37,19 @@ nginx:
              - location ~ .htm:
                  - try_files: '$uri $uri/ =404'
              - include: 'snippets/letsencrypt.conf'
      mysite_with_require:
        enabled: true
        config:
          - server:
              - server_name: with-deps
              - listen:
                  - '80'
              - index: 'index.html index.htm'
              - location ~ .htm:
                  - try_files: '$uri $uri/ =404'
        requires:
          file: created_to_test_dependencies
  dh_param:
    'mydhparam2.pem':
      keysize: 2048
--- a/test/salt/default/states/test_dep/create_dependency_file.sls
+++ b/test/salt/default/states/test_dep/create_dependency_file.sls
@ -0,0 +1,6 @@
 ## this state creates a file that is used to test vhosts dependencies
 # (see https://github.com/saltstack-formulas/nginx-formula/pull/278)
 created_to_test_dependencies:
  file.managed:
    - name: /tmp/created_to_test_dependencies
--- a/test/salt/passenger/pillar/nginx.sls
+++ b/test/salt/passenger/pillar/nginx.sls
@ -2,7 +2,6 @@
 # vim: ft=yaml
 ---
 # Simple pillar setup
 # - snippet letsencrypt
 # - remove 'default' site
 # - create 'mysite' site
@ -21,12 +20,7 @@ nginx:
  lookup:
    passenger_package: {{ passenger_pkg }}
  snippets:
    letsencrypt.conf:
      - location ^~ /.well-known/acme-challenge/:
          - proxy_pass: http://localhost:9999
  server:
    config:
      # This is required to get the passenger module loaded
      # In Debian it can be done with this
@ -64,5 +58,3 @@ nginx:
              - index: 'index.html index.htm'
              - location ~ .htm:
                  - try_files: '$uri $uri/ =404'
              # - include: '/etc/nginx/snippets/letsencrypt.conf'
              - include: 'snippets/letsencrypt.conf'