Disable journal dump on fail

Too noisy. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Revert "style(vhost): reduce empty lines"
2023-05-01 00:08:59 +02:00 · 2023-04-30 17:01:49 +02:00 · 2023-04-29 23:34:12 +02:00 · 2023-04-29 23:28:49 +02:00 · 2023-04-29 23:14:30 +02:00 · 2023-04-29 22:54:13 +02:00
16 changed files with 135 additions and 213 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -135,6 +135,7 @@ rubocop:
 # default-debian-11-tiamat-py3: {extends: '.test_instance'}
 # default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
@ -153,6 +154,9 @@ debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
 # modules-debian-9-master-py3: {extends: '.test_instance'}
 # debian-9-master-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+# modules-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # modules-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-2004-master-py3: {extends: '.test_instance'}
@ -165,12 +169,12 @@ centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # modules-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
+# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
+# modules-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
+fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-fedora-35-master-py3: {extends: '.test_instance'}
 # modules-fedora-35-master-py3: {extends: '.test_instance'}
 fedora-35-master-py3: {extends: '.test_instance'}
-# default-fedora-34-master-py3: {extends: '.test_instance'}
-# modules-fedora-34-master-py3: {extends: '.test_instance'}
-fedora-34-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # modules-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 opensuse-leap-153-master-py3: {extends: '.test_instance'}
@ -205,12 +209,13 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-debian-11-3004-1-py3: {extends: '.test_instance'}
 # default-debian-10-3004-1-py3: {extends: '.test_instance'}
 # default-debian-9-3004-1-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
 # default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-7-3004-1-py3: {extends: '.test_instance'}
+# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
 # default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
@ -231,14 +236,6 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
 # default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-debian-10-3002-8-py3: {extends: '.test_instance'}
-# default-debian-9-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
-# default-centos-7-3002-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length

 ###############################################################################
--- 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.25.1
+    rev: v1.30.1
    hooks:
      - id: rubocop
        name: Check Ruby files with rubocop
--- a/.travis.yml
+++ b/.travis.yml
@ -86,6 +86,7 @@ jobs:
    # - env: INSTANCE=default-debian-11-tiamat-py3
    # - env: INSTANCE=default-debian-10-tiamat-py3
    # - env: INSTANCE=default-debian-9-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-2204-tiamat-py3
    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
    # - env: INSTANCE=default-centos-stream8-tiamat-py3
@ -104,6 +105,9 @@ jobs:
    # - env: INSTANCE=default-debian-9-master-py3
    # - env: INSTANCE=modules-debian-9-master-py3
    # - env: INSTANCE=debian-9-master-py3
+    # - env: INSTANCE=default-ubuntu-2204-master-py3
+    # - env: INSTANCE=modules-ubuntu-2204-master-py3
+    - env: INSTANCE=ubuntu-2204-master-py3
    # - env: INSTANCE=default-ubuntu-2004-master-py3
    # - env: INSTANCE=modules-ubuntu-2004-master-py3
    - env: INSTANCE=ubuntu-2004-master-py3
@ -116,12 +120,12 @@ jobs:
    # - env: INSTANCE=default-centos-7-master-py3
    # - env: INSTANCE=modules-centos-7-master-py3
    - env: INSTANCE=centos-7-master-py3
+    # - env: INSTANCE=default-fedora-36-master-py3
+    # - env: INSTANCE=modules-fedora-36-master-py3
+    - env: INSTANCE=fedora-36-master-py3
    # - env: INSTANCE=default-fedora-35-master-py3
    # - env: INSTANCE=modules-fedora-35-master-py3
    - env: INSTANCE=fedora-35-master-py3
-    # - env: INSTANCE=default-fedora-34-master-py3
-    # - env: INSTANCE=modules-fedora-34-master-py3
-    - env: INSTANCE=fedora-34-master-py3
    # - env: INSTANCE=default-opensuse-leap-153-master-py3
    # - env: INSTANCE=modules-opensuse-leap-153-master-py3
    - env: INSTANCE=opensuse-leap-153-master-py3
@ -156,12 +160,13 @@ jobs:
    # - env: INSTANCE=default-debian-11-3004-1-py3
    # - env: INSTANCE=default-debian-10-3004-1-py3
    # - env: INSTANCE=default-debian-9-3004-1-py3
+    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
    # - env: INSTANCE=default-centos-stream8-3004-1-py3
    # - env: INSTANCE=default-centos-7-3004-1-py3
+    # - env: INSTANCE=default-fedora-36-3004-1-py3
    # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-fedora-34-3004-1-py3
    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
@ -182,14 +187,6 @@ jobs:
    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
    # - env: INSTANCE=default-almalinux-8-3003-4-py3
-    # - env: INSTANCE=default-debian-10-3002-8-py3
-    # - env: INSTANCE=default-debian-9-3002-8-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-8-py3
-    # - env: INSTANCE=default-centos-7-3002-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-8-py3

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 # frozen_string_literal: true

-source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org'
+source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')

 # Install the `inspec` gem using `git` because versions after `4.22.22`
 # suppress diff output; this version fixes this for our uses.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,20 +1,20 @@
 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 31b5b09a827ed9fcbc0b2d550ae4056013dcc92e
+  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
  branch: ssf
  specs:
-    inspec (5.10.11)
+    inspec (5.18.15)
      cookstyle
      faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.10.11)
+      inspec-core (= 5.18.15)
      mongo (= 2.13.2)
      progress_bar (~> 1.3.3)
      rake
-      train (~> 3.0)
+      train (~> 3.10)
      train-aws (~> 0.2)
      train-habitat (~> 0.1)
      train-winrm (~> 0.2)
-    inspec-core (5.10.11)
+    inspec-core (5.18.15)
      addressable (~> 2.4)
      chef-telemetry (~> 1.0, >= 1.0.8)
      faraday (>= 0.9.0, < 1.5)
@ -34,13 +34,13 @@ GIT
      sslshake (~> 1.2)
      thor (>= 0.20, < 2.0)
      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
+      train-core (~> 3.10)
      tty-prompt (~> 0.17)
      tty-table (~> 0.10)

 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8
+  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
  branch: ssf
  specs:
    kitchen-docker (2.12.0)
@ -49,7 +49,7 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.3.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@ -58,14 +58,14 @@ GEM
      public_suffix (>= 2.0.2, < 5.0)
    ast (2.4.2)
    aws-eventstream (1.2.0)
-    aws-partitions (1.573.0)
+    aws-partitions (1.607.0)
    aws-sdk-alexaforbusiness (1.56.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-amplify (1.32.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.75.0)
+    aws-sdk-apigateway (1.78.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-apigatewayv2 (1.42.0)
@ -74,7 +74,7 @@ GEM
    aws-sdk-applicationautoscaling (1.51.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.52.0)
+    aws-sdk-athena (1.55.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-autoscaling (1.63.0)
@ -83,13 +83,13 @@ GEM
    aws-sdk-batch (1.47.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.49.0)
+    aws-sdk-budgets (1.50.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.68.0)
+    aws-sdk-cloudformation (1.70.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.63.0)
+    aws-sdk-cloudfront (1.65.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudhsm (1.39.0)
@ -98,16 +98,16 @@ GEM
    aws-sdk-cloudhsmv2 (1.42.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.48.0)
+    aws-sdk-cloudtrail (1.49.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.62.0)
+    aws-sdk-cloudwatch (1.64.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudwatchevents (1.46.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.52.0)
+    aws-sdk-cloudwatchlogs (1.53.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-codecommit (1.51.0)
@ -125,24 +125,24 @@ GEM
    aws-sdk-cognitoidentityprovider (1.53.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.76.0)
+    aws-sdk-configservice (1.79.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.0)
+    aws-sdk-core (3.131.2)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
+      jmespath (~> 1, >= 1.6.1)
    aws-sdk-costandusagereportservice (1.40.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-databasemigrationservice (1.53.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.74.0)
+    aws-sdk-dynamodb (1.75.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.305.0)
+    aws-sdk-ec2 (1.322.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ecr (1.56.0)
@ -151,16 +151,16 @@ GEM
    aws-sdk-ecrpublic (1.12.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.99.0)
+    aws-sdk-ecs (1.100.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.53.0)
+    aws-sdk-efs (1.54.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.74.0)
+    aws-sdk-eks (1.75.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.76.0)
+    aws-sdk-elasticache (1.78.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticbeanstalk (1.51.0)
@ -169,7 +169,7 @@ GEM
    aws-sdk-elasticloadbalancing (1.40.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.77.0)
+    aws-sdk-elasticloadbalancingv2 (1.78.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticsearchservice (1.65.0)
@ -187,31 +187,31 @@ GEM
    aws-sdk-glue (1.88.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.56.0)
+    aws-sdk-guardduty (1.58.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.68.0)
+    aws-sdk-iam (1.69.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.49.0)
+    aws-sdk-kafka (1.50.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-kinesis (1.41.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.55.0)
+    aws-sdk-kms (1.57.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.82.0)
+    aws-sdk-lambda (1.84.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-mq (1.40.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-networkfirewall (1.15.0)
+    aws-sdk-networkfirewall (1.17.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.22.0)
+    aws-sdk-networkmanager (1.24.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-organizations (1.59.0)
@ -220,13 +220,13 @@ GEM
    aws-sdk-ram (1.26.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.142.0)
+    aws-sdk-rds (1.148.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.80.0)
+    aws-sdk-redshift (1.84.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.62.0)
+    aws-sdk-route53 (1.63.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53domains (1.40.0)
@ -235,7 +235,7 @@ GEM
    aws-sdk-route53resolver (1.37.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
+    aws-sdk-s3 (1.114.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@ -245,7 +245,7 @@ GEM
    aws-sdk-secretsmanager (1.46.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.62.0)
+    aws-sdk-securityhub (1.67.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-servicecatalog (1.60.0)
@ -263,16 +263,16 @@ GEM
    aws-sdk-simpledb (1.29.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.39.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.0)
+    aws-sdk-sqs (1.51.1)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.134.0)
+    aws-sdk-ssm (1.137.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-states (1.39.0)
@ -288,7 +288,7 @@ GEM
      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sigv2 (1.1.0)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
      aws-eventstream (~> 1, >= 1.0.2)
    azure_graph_rbac (0.17.2)
      ms_rest_azure (~> 0.12.0)
@ -301,7 +301,7 @@ GEM
    azure_mgmt_storage (0.23.0)
      ms_rest_azure (~> 0.12.0)
    bcrypt_pbkdf (1.1.0)
-    bson (4.14.1)
+    bson (4.15.0)
    builder (3.2.4)
    chef-config (17.10.0)
      addressable
@ -328,7 +328,7 @@ GEM
      unf (>= 0.0.5, < 1.0.0)
    ed25519 (1.3.0)
    erubi (1.10.0)
-    excon (0.92.2)
+    excon (0.92.3)
    faraday (1.4.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@ -372,23 +372,23 @@ GEM
      rexml (~> 3.0)
    hashie (4.1.0)
    highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
    jmespath (1.6.1)
-    json (2.6.1)
-    jwt (2.3.0)
-    kitchen-inspec (2.5.2)
+    json (2.6.2)
+    jwt (2.4.1)
+    kitchen-inspec (2.6.1)
      hashie (>= 3.4, <= 5.0)
-      inspec (>= 2.2.64, < 6.0)
+      inspec (>= 2.2.64, < 7.0)
      test-kitchen (>= 2.7, < 4)
    kitchen-salt (0.7.2)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
-    kitchen-vagrant (1.11.0)
+    kitchen-vagrant (1.12.0)
      test-kitchen (>= 1.4, < 4)
    license-acceptance (2.1.13)
      pastel (~> 0.7)
@ -396,21 +396,21 @@ GEM
      tty-box (~> 0.6)
      tty-prompt (~> 0.20)
    little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.3.1)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
    mini_mime (1.1.2)
-    minitest (5.15.0)
-    mixlib-config (3.0.9)
+    minitest (5.16.2)
+    mixlib-config (3.0.27)
      tomlrb
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.19)
      mixlib-shellout
      mixlib-versioning
      thor
    mixlib-log (3.0.9)
-    mixlib-shellout (3.2.6)
+    mixlib-shellout (3.2.7)
      chef-utils
    mixlib-versioning (1.2.12)
    mongo (2.13.2)
@ -425,7 +425,7 @@ 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)
@ -435,7 +435,7 @@ GEM
    options (2.3.2)
    os (1.1.4)
    parallel (1.22.1)
-    parser (3.1.1.0)
+    parser (3.1.2.0)
      ast (~> 2.4.1)
    parslet (1.8.2)
    pastel (0.8.0)
@ -446,11 +446,11 @@ GEM
    pry (0.14.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
    rainbow (3.1.1)
    rake (13.0.6)
-    regexp_parser (2.2.1)
-    representable (3.1.1)
+    regexp_parser (2.5.0)
+    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
@ -481,16 +481,16 @@ GEM
      rubocop-ast (>= 1.15.1, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.19.1)
      parser (>= 3.1.1.0)
    ruby-progressbar (1.11.0)
    ruby2_keywords (0.0.5)
    rubyntlm (0.6.3)
    rubyzip (2.3.2)
-    semverse (3.0.0)
-    signet (0.16.1)
+    semverse (3.0.2)
+    signet (0.17.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
@ -499,7 +499,7 @@ GEM
      unicode-display_width (>= 1.5, < 3.0)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    test-kitchen (3.2.2)
+    test-kitchen (3.3.1)
      bcrypt_pbkdf (~> 1.0)
      chef-utils (>= 16.4.35)
      ed25519 (~> 1.2)
@ -517,7 +517,7 @@ GEM
    timeliness (0.3.10)
    tomlrb (1.3.0)
    trailblazer-option (0.1.2)
-    train (3.8.9)
+    train (3.10.1)
      activesupport (>= 6.0.3.1)
      azure_graph_rbac (~> 0.16)
      azure_mgmt_key_vault (~> 0.17)
@ -528,7 +528,7 @@ GEM
      google-api-client (>= 0.23.9, <= 0.52.0)
      googleauth (>= 0.6.6, <= 0.14.0)
      inifile (~> 3.0)
-      train-core (= 3.8.9)
+      train-core (= 3.10.1)
      train-winrm (~> 0.2)
    train-aws (0.2.24)
      aws-sdk-alexaforbusiness (~> 1.0)
@ -606,7 +606,7 @@ GEM
      aws-sdk-synthetics (~> 1.19.0)
      aws-sdk-transfer (>= 1.26, < 1.35)
      aws-sdk-waf (~> 1.43.0)
-    train-core (3.8.9)
+    train-core (3.10.1)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
@ -641,8 +641,8 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.1)
-    unicode-display_width (2.1.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.2.0)
    unicode_utils (1.4.0)
    winrm (2.3.6)
      builder (>= 2.1.2)
--- a/apache/config/init.sls
+++ b/apache/config/init.sls
@ -2,14 +2,4 @@
 # vim: ft=sls

 include:
-  - .file
-  # .modules.clean  # disable (exclude from init state)
-  # .modules        # enable by default (read pillars)
-  # .debian_full
-  - .flags
-  - .logrotate
-  - .manage_security
-  - .no_default_vhost
-  # .own_default_vhost
-  - .register_site
  - .vhosts
--- a/apache/config/vhosts/standard.sls
+++ b/apache/config/vhosts/standard.sls
@ -30,10 +30,6 @@ apache-config-vhosts-standard-{{ id }}:
    - require:
      - pkg: apache-package-install-pkg-installed
    - watch_in:
-      - module: apache-service-running-reload
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
      - service: apache-service-running

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

          {%- else %}
@ -72,10 +64,6 @@ apache-config-vhosts-standard-{{ id }}-cmd-run-a2dis:
    - require:
      - file: apache-config-vhosts-standard-{{ id }}
    - watch_in:
-      - module: apache-service-running-reload
-    - require_in:
-      - module: apache-service-running-restart
-      - module: apache-service-running-reload
      - service: apache-service-running

          {%- endif %}
--- a/apache/package/install.sls
+++ b/apache/package/install.sls
@ -4,6 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}

+{#- consider moving this to an optional state or enabling it with a pillar option
    {%- if 'deps' in apache.pkg and apache.pkg.deps and apache.pkg.deps is iterable and apache.pkg.deps is not string %}
 apache-package-install-deps-pkg-installed:
  pkg.installed:
@ -11,6 +12,7 @@ apache-package-install-deps-pkg-installed:
    - require:
      - apache-package-install-pkg-installed
    {%- endif %}
+#}

 apache-package-install-pkg-installed:
    {%- if grains.os_family == 'Windows' %}
--- a/apache/service/running.sls
+++ b/apache/service/running.sls
@ -2,63 +2,10 @@
 # vim: ft=sls

 {%- set tplroot = tpldir.split('/')[0] %}
-{%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- set sls_config_registersite = tplroot ~ '.config.register_site' %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}

-include:
-  - {{ sls_config_file }}
-  - {{ sls_config_registersite }}
-
 apache-service-running:
-  {%- if salt['pillar.get']('apache:manage_service_states', True) %}
-      {# By default run apache service states (unless pillar is false) #}
  service.running:
    - name: {{ apache.service.name }}
    - enable: True
-    - watch:
-      - sls: {{ sls_config_file }}
-    - retry: {{ apache.retry_option|json }}
-  cmd.run:
-    - names:
-      - journalctl -xe -u {{ apache.service.name }} || tail -20 /var/log/messages || true
-      - (service {{ apache.service.name }} restart && service {{ apache.service.name }} status) || true
-      - cat {{ apache.config }}
-    - onfail:
-      - service: apache-service-running
-  {%- endif %}
-
-  {# The following states are by default inert and can be used #}
-  {# by other states to trigger a restart or reload as needed. #}
-
-apache-service-running-restart:
-  module.wait:
-         {%- if apache.service_state in ['running'] %}
-    - name: service.restart
-    - m_name: {{ apache.service.name }}
-         {%- else %}
-    - name: cmd.run
-    - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
-    - python_shell: True
-         {%- endif %}
-    - watch:
-      - sls: {{ sls_config_file }}
-    - require:
-      - sls: {{ sls_config_file }}
-      - service: apache-service-running
-
-apache-service-running-reload:
-  module.wait:
-         {%- if apache.service_state in ['running'] %}
-    - name: service.reload
-    - m_name: {{ apache.service.name }}
-         {%- else %}
-    - name: cmd.run
-    - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
-    - python_shell: True
-         {%- endif %}
-    - watch:
-      - sls: {{ sls_config_file }}
-    - require:
-      - sls: {{ sls_config_file }}
-      - service: apache-service-running
+    - reload: True
--- 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, '\
-      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      'Your `bin/bundle` was not generated by Bundler, ' \
+      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
      '`bundle binstubs bundler --force`, then run this command again.'
    )
  end
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@ -9,8 +9,8 @@ driver:
  gui: false
  ssh:
    shell: /bin/sh
-  <% unless ENV['CI'] %>
  linked_clone: true
+  <% unless ENV['CI'] %>
  synced_folders:
    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
      - '/vagrant'
--- a/kitchen.yml
+++ b/kitchen.yml
@ -32,6 +32,10 @@ platforms:
    driver:
      image: saltimages/salt-tiamat-py3:debian-9
      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-20.04
@ -75,6 +79,10 @@ platforms:
    driver:
      image: saltimages/salt-master-py3:debian-9
      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-20.04
@ -89,12 +97,12 @@ platforms:
  - name: centos-7-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-7
+  - name: fedora-36-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-36
  - name: fedora-35-master-py3
    driver:
      image: saltimages/salt-master-py3:fedora-35
-  - name: fedora-34-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-34
  - name: opensuse-leap-153-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-leap-15.3
@ -148,6 +156,10 @@ platforms:
    driver:
      image: saltimages/salt-3004.1-py3:debian-9
      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3004-1-py3
    driver:
      image: saltimages/salt-3004.1-py3:ubuntu-20.04
@ -162,12 +174,12 @@ platforms:
  - name: centos-7-3004-1-py3
    driver:
      image: saltimages/salt-3004.1-py3:centos-7
+  - name: fedora-36-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:fedora-36
  - name: fedora-35-3004-1-py3
    driver:
      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: fedora-34-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-34
  - name: amazonlinux-2-3004-1-py3
    driver:
      image: saltimages/salt-3004.1-py3:amazonlinux-2
@ -246,36 +258,6 @@ platforms:
    driver:
      image: saltimages/salt-3003.4-py3:almalinux-8

-  ## SALT `3002.8`
-  - name: debian-10-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-7-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:centos-7
-  - name: amazonlinux-2-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:oraclelinux-7
-
 verifier:
  # https://www.inspec.io/
  name: inspec
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@ -24,4 +24,5 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
+  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/modules/inspec.yml
+++ b/test/integration/modules/inspec.yml
@ -24,4 +24,5 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
+  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@ -21,4 +21,5 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
+  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@ -57,6 +57,8 @@ class SystemResource < Inspec.resource(1)
      'base-latest'
    when 'gentoo'
      "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
+    when 'mac_os_x'
+      inspec.command('sw_vers -productVersion').stdout.to_s
    when 'opensuse'
      # rubocop:disable Style/NumericLiterals,Layout/LineLength
      inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
@ -95,6 +97,8 @@ class SystemResource < Inspec.resource(1)
  # 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'
Author	SHA1	Message	Date
Georg Pfuetzenreuter	9cf4951f15	Disable journal dump on fail Too noisy. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-01 00:08:59 +02:00
Georg Pfuetzenreuter	2abb801af7	Revert "style(vhost): reduce empty lines" This reverts commit `4157db4d29`. New formatting did not work out as anticipated.	2023-04-30 17:01:49 +02:00
Georg Pfuetzenreuter	a6f1fb91d5	Disable pkg-deps Backend webservers do not need modsecurity installed. Comment out the state and add comment about suggestion for making the modsecurity installation based on a conditional in the future. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-29 23:34:12 +02:00
Georg Pfuetzenreuter	e1685ffbeb	Simplify service management In our environment a simple state ensuring the service is running and having it reload on configuration changes should be more than sufficient. Additionally, remove restart retries and useless log/config dumping on failures. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-29 23:28:49 +02:00
Georg Pfuetzenreuter	b22a6cf1bb	Disable config.file hooks in service.running Follow-up to `14aa73e1ab`, do not indirectly include config file management with requirements. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-29 23:14:30 +02:00
Georg Pfuetzenreuter	9f2bcb52b7	Disable register_site include Avoid useless rendering of Debian specific state. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-29 22:54:13 +02:00
Georg Pfuetzenreuter	14aa73e1ab	Disable superfluous config states We are using the files and directories shipped with the apache2 package and do not want them to be overwritten. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-04-29 22:44:14 +02:00
Georg Pfuetzenreuter	4157db4d29	style(vhost): reduce empty lines Avoid lots of empty lines if options are not used. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-18 18:24:45 +01:00
Imran Iqbal	1553a9d5bc	chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/454	2022-07-17 19:40:10 +01:00
Imran Iqbal	f36c291752	chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/453	2022-06-30 23:02:56 +01:00
Imran Iqbal	9c9bfe9538	chore(gemfile.lock): update to latest gem versions (2022-W24) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/452	2022-06-15 23:00:23 +01:00
Imran Iqbal	3f95ed6dc2	ci: update `pre-commit` configuration inc. for pre-commit.ci [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/450	2022-06-08 23:57:55 +01:00
Imran Iqbal	60f9d3b5e5	chore(gemfile.lock): update to latest gem versions (2022-W23) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/449	2022-06-07 23:25:21 +01:00
Imran Iqbal	d4cab05532	chore(gemfile.lock): update to latest gem versions (2022-W22) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/447	2022-05-30 17:22:48 +01:00
Imran Iqbal	692cea45a1	chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/444	2022-05-17 13:14:53 +01:00
Imran Iqbal	ac62a7ae41	test(system.rb): add support for `mac_os_x` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/442	2022-05-17 08:45:20 +01:00
Imran Iqbal	6fbf2d8d2d	ci(vagrant): use `linked_clone` at all times (inc. CI) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/441	2022-05-14 20:10:16 +01:00
Imran Iqbal	41d0bfbca2	chore(gemfile.lock): update to latest gem versions (2022-W19) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/439	2022-05-10 07:28:14 +01:00
Imran Iqbal	ec3563d97f	chore(gemfile.lock): update to latest gem versions (2022-W18) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/437	2022-05-06 23:09:56 +01:00
Imran Iqbal	5ff4c6332c	chore(gemfile.lock): update to latest gem versions (2022-W17) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/433	2022-04-25 09:05:49 +01:00
Imran Iqbal	5aab2d72d7	chore(gemfile.lock): update to latest gem versions (2022-W16) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/431	2022-04-18 23:32:09 +01:00
Imran Iqbal	984adc6193	chore(gemfile.lock): update to latest gem versions (2022-W15) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/428	2022-04-11 19:14:48 +01:00