chore(release): 0.41.4 [skip ci]

## [0.41.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.3...v0.41.4) (2020-12-16) ### Bug Fixes * **archlinux:** avoid nonetype error ([0a6cf8f](0a6cf8fefa)) * **archlinux:** use consistent jinja repo check ([3a955e0](3a955e0270)) * **jinja:** syntax correction ([8b44c06](8b44c068fc)) * **python:** use python3 postres on cent7/8 ([d6d1068](d6d1068395)) * **suse:** version 11+ repo support on suse ([b3f381e](b3f381e547)) ### Continuous Integration * **gitlab-ci:** use GitLab CI as Travis CI replacement ([a45673a](a45673a878)) * **pre-commit:** add to formula [skip ci] ([db1794b](db1794b6bb)) * **pre-commit:** enable/disable `rstcheck` as relevant [skip ci] ([f04d60a](f04d60a773)) * **pre-commit:** finalise `rstcheck` configuration [skip ci] ([7036f60](7036f60e8c))
ci(gitlab-ci): use GitLab CI as Travis CI replacement
2020-12-16 06:51:15 +00:00 · 2020-12-16 06:38:36 +00:00 · 2020-12-08 10:53:53 +00:00 · 2020-12-07 10:24:36 +00:00 · 2020-12-05 23:30:03 +00:00 · 2020-12-05 13:45:46 +00:00
25 changed files with 764 additions and 379 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,156 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+###############################################################################
+# Define all YAML node anchors
+###############################################################################
+.node_anchors:
+  # `only` (also used for `except` where applicable)
+  only_branch_master_parent_repo: &only_branch_master_parent_repo
+    - 'master@saltstack-formulas/postgres-formula'
+  # `stage`
+  stage_lint: &stage_lint 'lint'
+  stage_release: &stage_release 'release'
+  stage_test: &stage_test 'test'
+  # `image`
+  image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
+  image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
+  image_precommit: &image_precommit
+    name: 'myii/ssf-pre-commit:2.9.2'
+    entrypoint: ['/bin/bash', '-c']
+  image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
+  # `services`
+  services_docker_dind: &services_docker_dind
+    - 'docker:dind'
+  # `variables`
+  # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
+  # https://bundler.io/v1.16/bundle_config.html
+  variables_bundler: &variables_bundler
+    BUNDLE_CACHE_PATH: '${CI_PROJECT_DIR}/.cache/bundler'
+    BUNDLE_WITHOUT: 'production'
+  # `cache`
+  cache_bundler: &cache_bundler
+    key: '${CI_JOB_STAGE}'
+    paths:
+      - '${BUNDLE_CACHE_PATH}'
+
+###############################################################################
+# Define stages and global variables
+###############################################################################
+stages:
+  - *stage_lint
+  - *stage_test
+  - *stage_release
+variables:
+  DOCKER_DRIVER: 'overlay2'
+
+###############################################################################
+# `lint` stage: `commitlint` & `pre-commit`
+###############################################################################
+commitlint:
+  stage: *stage_lint
+  image: *image_commitlint
+  script:
+    # Add `upstream` remote to get access to `upstream/master`
+    - 'git remote add upstream ${CI_PROJECT_URL}.git'
+    - 'git fetch --all'
+    # Set default commit hashes for `--from` and `--to`
+    - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
+    - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
+    # `coqbot` adds a merge commit to test PRs on top of the latest commit in
+    # the repo; amend this merge commit message to avoid failure
+    - |
+      if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
+      && [ "${CI_COMMIT_BRANCH}" != "master" ]; then
+        git commit --amend -m \
+          'chore: reword coqbot merge commit message for commitlint'
+        export COMMITLINT_TO=HEAD
+      fi
+    # Run `commitlint`
+    - 'commitlint --from "${COMMITLINT_FROM}"
+                  --to   "${COMMITLINT_TO}"
+                  --verbose'
+
+pre-commit:
+  stage: *stage_lint
+  image: *image_precommit
+  # https://pre-commit.com/#gitlab-ci-example
+  variables:
+    PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit'
+  cache:
+    key: '${CI_JOB_NAME}'
+    paths:
+      - '${PRE_COMMIT_HOME}'
+  script:
+    - 'pre-commit run --all-files --color always --verbose'
+
+###############################################################################
+# Define `test` template
+###############################################################################
+.test_instance:
+  stage: *stage_test
+  image: *image_dindruby
+  services: *services_docker_dind
+  variables: *variables_bundler
+  cache: *cache_bundler
+  before_script:
+    # TODO: This should work from the env vars above automatically
+    - 'bundle config set path "${BUNDLE_CACHE_PATH}"'
+    - 'bundle config set without "${BUNDLE_WITHOUT}"'
+    - 'bundle install'
+  script:
+    # Alternative value to consider: `${CI_JOB_NAME}`
+    - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
+
+###############################################################################
+# `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`
+default-debian-10-master-py3: {extends: '.test_instance'}
+default-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+default-centos-8-master-py3: {extends: '.test_instance'}
+default-fedora-32-master-py3: {extends: '.test_instance'}
+# default-fedora-31-master-py3: {extends: '.test_instance'}
+default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# default-debian-10-3000-3-py3: {extends: '.test_instance'}
+# default-debian-9-3000-3-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
+# default-centos-8-3000-3-py3: {extends: '.test_instance'}
+# default-centos-7-3000-3-py3: {extends: '.test_instance'}
+# default-fedora-31-3000-3-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
+# default-debian-10-2019-2-py3: {extends: '.test_instance'}
+# default-debian-9-2019-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-2019-2-py3: {extends: '.test_instance'}
+# default-centos-8-2019-2-py3: {extends: '.test_instance'}
+# default-centos-7-2019-2-py3: {extends: '.test_instance'}
+# default-fedora-31-2019-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-2019-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
+# default-centos-6-2019-2-py2: {extends: '.test_instance'}
+# default-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
+default-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
+
+###############################################################################
+# `release` stage: `semantic-release`
+###############################################################################
+semantic-release:
+  only: *only_branch_master_parent_repo
+  stage: *stage_release
+  image: *image_semanticrelease
+  variables:
+    MAINTAINER_TOKEN: '${GH_TOKEN}'
+  script:
+    # Update `AUTHORS.md`
+    - '${HOME}/go/bin/maintainer contributor'
+    # Run `semantic-release`
+    - 'semantic-release'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+default_stages: [commit]
+repos:
+  - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
+    rev: v2.3.0
+    hooks:
+      - id: commitlint
+        name: Check commit message using commitlint
+        description: Lint commit message against @commitlint/config-conventional rules
+        stages: [commit-msg]
+        additional_dependencies: ['@commitlint/config-conventional@8.3.4']
+      - id: commitlint-travis
+        stages: [manual]
+        additional_dependencies: ['@commitlint/config-conventional@8.3.4']
+        always_run: true
+  - repo: https://github.com/adithyabsk/mirrors-rubocop
+    rev: v0.91.0
+    hooks:
+      - id: rubocop
+        name: Check Ruby files with rubocop
+        args: [--debug]
+        always_run: true
+        pass_filenames: false
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 2.1.3
+    hooks:
+      - id: shellcheck
+        name: Check shell scripts with shellcheck
+        files: ^.*\.(sh|bash|ksh)$
+        types: []
+        args: []
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.23.0
+    hooks:
+      - id: yamllint
+        name: Check YAML syntax with yamllint
+        args: [--strict, '.']
+        always_run: true
+        pass_filenames: false
+  - repo: https://github.com/warpnet/salt-lint
+    rev: v0.3.0
+    hooks:
+      - id: salt-lint
+        name: Check Salt files using salt-lint
+        files: ^.*\.(sls|jinja|j2|tmpl|tst)$
+  - repo: https://github.com/myint/rstcheck
+    rev: 3f929574
+    hooks:
+      - id: rstcheck
+        name: Check reST files using rstcheck
+        exclude: 'docs/CHANGELOG.rst'
+        args: [--report=warning]
--- a/.rstcheck.cfg
+++ b/.rstcheck.cfg
@@ -0,0 +1,3 @@
+[rstcheck]
+report=error
+ignore_language=rst
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,15 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+################################################################################
+# NOTE: This file is UNMAINTAINED; it is provided for references purposes only.
+#       No guarantees are tendered that this structure will work after 2020.
+################################################################################
+# * https://en.wikipedia.org/wiki/Travis_CI:
+#   - "... free open-source plans were removed in [sic] the end of 2020"
+#   - https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
+#   - https://ropensci.org/technotes/2020/11/19/moving-away-travis/
+################################################################################
 ## Machine config
 os: 'linux'
 arch: 'amd64'
@@ -22,8 +31,10 @@ script:
 ## Stages and jobs matrix
 stages:
  - test
-  - name: 'release'
-    if: 'branch = master AND type != pull_request'
+  # # As part of the switch away from Travis CI, ensure that the `release` stage
+  # # is not run inadvertently
+  # - name: 'release'
+  #   if: 'branch = master AND type != pull_request'
 jobs:
  include:
    ## Define the test stage that runs the linters (and testing matrix, if applicable)
@@ -55,38 +66,54 @@ jobs:
                   @commitlint/travis-cli
        - commitlint-travis

+    # Run `pre-commit` linters in a single job
+    - language: 'python'
+      env: 'Lint_pre-commit'
+      name: 'Lint: pre-commit'
+      before_install: 'skip'
+      cache:
+        directories:
+          - $HOME/.cache/pre-commit
+      script:
+        # Install and run `pre-commit`
+        - pip install pre-commit==2.7.1
+        - pre-commit run --all-files --color always --verbose
+        - pre-commit run --color always --hook-stage manual --verbose commitlint-travis
+
    ## 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-10-master-py3
+    - env: INSTANCE=default-ubuntu-2004-master-py3
    # - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-fedora-32-master-py3
    # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-opensuse-leap-151-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-master-py3
+    - env: INSTANCE=default-opensuse-leap-152-master-py3
+    - env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=default-debian-10-3000-3-py3
+    # - env: INSTANCE=default-debian-9-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py3
+    # - env: INSTANCE=default-centos-8-3000-3-py3
+    # - env: INSTANCE=default-centos-7-3000-3-py3
+    # - env: INSTANCE=default-fedora-31-3000-3-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=default-ubuntu-1604-3000-3-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-3-py2
    # - env: INSTANCE=default-debian-10-2019-2-py3
    # - env: INSTANCE=default-debian-9-2019-2-py3
    # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    - env: INSTANCE=default-centos-8-2019-2-py3
-    - env: INSTANCE=default-fedora-31-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py2
+    # - env: INSTANCE=default-ubuntu-1604-2019-2-py3
+    # - env: INSTANCE=default-centos-8-2019-2-py3
+    # - env: INSTANCE=default-centos-7-2019-2-py3
+    # - env: INSTANCE=default-fedora-31-2019-2-py3
+    # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
    # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
-    # - env: INSTANCE=default-fedora-30-2018-3-py3
-    # - env: INSTANCE=default-debian-9-2018-3-py2
-    - env: INSTANCE=default-ubuntu-1604-2018-3-py2
-    # - env: INSTANCE=default-centos-7-2018-3-py2
-    - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=default-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=default-debian-8-2017-7-py2
-    # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
-    - env: INSTANCE=default-centos-6-2017-7-py2
-    # - env: INSTANCE=default-fedora-30-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=default-amazonlinux-1-2017-7-py2
-    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+    # - env: INSTANCE=default-centos-6-2019-2-py2
+    # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
+    - env: INSTANCE=default-arch-base-latest-2019-2-py2

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/.yamllint
+++ b/.yamllint
@@ -10,6 +10,7 @@ extends: default
 # 3. Any YAML files under directory `.kitchen/`, introduced during local testing
 # 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
 ignore: |
+  .cache/
  node_modules/
  test/**/states/**/*.sls
  .kitchen/
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,8 +4,8 @@ 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://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|119
-<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|62
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|129
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|72
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|54
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|19
@@ -22,7 +22,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3449635?v=4' width='36' height='36' alt='@rominf'>|[@rominf](https://github.com/rominf)|7
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>|[@alfredopalhares](https://github.com/alfredopalhares)|6
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|5
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyr'>|[@audreyr](https://github.com/audreyr)|5
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyfeldroy'>|[@audreyfeldroy](https://github.com/audreyfeldroy)|5
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>|[@blast-hardcheese](https://github.com/blast-hardcheese)|5
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2179770?v=4' width='36' height='36' alt='@gilou'>|[@gilou](https://github.com/gilou)|5
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|5
@@ -31,6 +31,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1435085?v=4' width='36' height='36' alt='@blbradley'>|[@blbradley](https://github.com/blbradley)|3
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2192630?v=4' width='36' height='36' alt='@abrefort'>|[@abrefort](https://github.com/abrefort)|3
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/296940?v=4' width='36' height='36' alt='@renoirb'>|[@renoirb](https://github.com/renoirb)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|2
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1078927?v=4' width='36' height='36' alt='@Ken-2scientists'>|[@Ken-2scientists](https://github.com/Ken-2scientists)|2
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/22311?v=4' width='36' height='36' alt='@madssj'>|[@madssj](https://github.com/madssj)|2
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/102919?v=4' width='36' height='36' alt='@h3'>|[@h3](https://github.com/h3)|2
@@ -65,8 +66,9 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8005290?v=4' width='36' height='36' alt='@YetAnotherMinion'>|[@YetAnotherMinion](https://github.com/YetAnotherMinion)|1
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>|[@ek9](https://github.com/ek9)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11394644?v=4' width='36' height='36' alt='@Strade288'>|[@Strade288](https://github.com/Strade288)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|1
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|1

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-10.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-12-16.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,50 @@
 # Changelog

+## [0.41.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.3...v0.41.4) (2020-12-16)
+
+
+### Bug Fixes
+
+* **archlinux:** avoid nonetype error ([0a6cf8f](https://github.com/saltstack-formulas/postgres-formula/commit/0a6cf8fefae1bbd5668a447ced911088ac965475))
+* **archlinux:** use consistent jinja repo check ([3a955e0](https://github.com/saltstack-formulas/postgres-formula/commit/3a955e02708b23929c93f879bcba0e3fe5ae5666))
+* **jinja:** syntax correction ([8b44c06](https://github.com/saltstack-formulas/postgres-formula/commit/8b44c068fcfd4199336596bdba095fc0e6c8fb2e))
+* **python:** use python3 postres on cent7/8 ([d6d1068](https://github.com/saltstack-formulas/postgres-formula/commit/d6d1068395131de08534e387d377389bd078d3ee))
+* **suse:** version 11+ repo support on suse ([b3f381e](https://github.com/saltstack-formulas/postgres-formula/commit/b3f381e54750a00bb19a4aa50c6273c627dca16c))
+
+
+### Continuous Integration
+
+* **gitlab-ci:** use GitLab CI as Travis CI replacement ([a45673a](https://github.com/saltstack-formulas/postgres-formula/commit/a45673a87892deb973afee3689aea4bebd7a5739))
+* **pre-commit:** add to formula [skip ci] ([db1794b](https://github.com/saltstack-formulas/postgres-formula/commit/db1794b6bbb6ce183e5231cb4b7e7193dcb80143))
+* **pre-commit:** enable/disable `rstcheck` as relevant [skip ci] ([f04d60a](https://github.com/saltstack-formulas/postgres-formula/commit/f04d60a773461dce98b4f2a7c8abbbab268513a0))
+* **pre-commit:** finalise `rstcheck` configuration [skip ci] ([7036f60](https://github.com/saltstack-formulas/postgres-formula/commit/7036f60e8ca3857beeca18abe70a3c59b6a021ec))
+
+## [0.41.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.2...v0.41.3) (2020-09-29)
+
+
+### Bug Fixes
+
+* **upstream:** require_in/require use_upstream ([ab6b97e](https://github.com/saltstack-formulas/postgres-formula/commit/ab6b97e8c3ff40f9cb2e629c3c0faf09ca59ede9))
+
+## [0.41.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.1...v0.41.2) (2020-07-27)
+
+
+### Bug Fixes
+
+* **macros:** fix `format_kwargs` macro ([5e6511b](https://github.com/saltstack-formulas/postgres-formula/commit/5e6511b783388930010e6c0795b197728fb10b39))
+
+
+### Continuous Integration
+
+* **kitchen:** ubuntu-2004-master-py3 added ([7978976](https://github.com/saltstack-formulas/postgres-formula/commit/79789765439bb0727521dc817fe9eaebba000a67))
+* **kitchen+travis:** use latest pre-salted images [skip ci] ([702323c](https://github.com/saltstack-formulas/postgres-formula/commit/702323c24df1df6b11defd663b55cf38586bd3f3))
+* **travis:** ubuntu upgrade from 16 to 18 & 20 ([44568a6](https://github.com/saltstack-formulas/postgres-formula/commit/44568a680602fb61f157b74dc05f9af9b153e8e6))
+
+
+### Styles
+
+* **libtofs.jinja:** use Black-inspired Jinja formatting [skip ci] ([8735cf8](https://github.com/saltstack-formulas/postgres-formula/commit/8735cf8ad1b9fc1eb816aecf3d363d4fc81fbe66))
+
 ## [0.41.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.0...v0.41.1) (2020-07-10)


--- a/8
+++ b/8
@@ -10,16 +10,20 @@
 # SECTION: Owner(s) for files/directories related to `semantic-release`
 # FILE PATTERN                              OWNER(S)
 /.github/workflows/                         @saltstack-formulas/ssf
+/bin/install-hooks                          @saltstack-formulas/ssf
 /bin/kitchen                                @saltstack-formulas/ssf
 /docs/AUTHORS.rst                           @saltstack-formulas/ssf
 /docs/CHANGELOG.rst                         @saltstack-formulas/ssf
 /docs/TOFS_pattern.rst                      @saltstack-formulas/ssf
-/postgres/libsaltcli.jinja                  @saltstack-formulas/ssf
-/postgres/libtofs.jinja                     @saltstack-formulas/ssf
+/*/libsaltcli.jinja                         @saltstack-formulas/ssf
+/*/libtofs.jinja                            @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
+/.gitlab-ci.yml                             @saltstack-formulas/ssf
+/.pre-commit-config.yaml                    @saltstack-formulas/ssf
+/.rstcheck.cfg                              @saltstack-formulas/ssf
 /.rubocop.yml                               @saltstack-formulas/ssf
 /.salt-lint                                 @saltstack-formulas/ssf
 /.travis.yml                                @saltstack-formulas/ssf
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 name: postgres
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.41.1
+version: 0.41.4
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula
--- a/11
+++ b/11
@@ -2,9 +2,14 @@

 source 'https://rubygems.org'

-gem 'kitchen-docker', '>= 2.9'
-gem 'kitchen-inspec', '>= 1.1'
-gem 'kitchen-salt', '>= 0.6.0'
+# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
+# regression where the diff isn't displayed when comparing using `eq`.
+gem 'inspec',      '~> 4.22.22'
+# Install the `kitchen-docker` gem from GitHub because the latest version
+# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
+gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe'
+gem 'kitchen-inspec', '>= 2.2.1'
+gem 'kitchen-salt', '>= 0.6.3'

 group :vagrant do
  gem 'kitchen-vagrant'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,15 @@
+GIT
+  remote: https://github.com/test-kitchen/kitchen-docker.git
+  revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848
+  ref: 41e80fe
+  specs:
+    kitchen-docker (2.10.0)
+      test-kitchen (>= 1.0.0)
+
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@@ -9,186 +17,189 @@ GEM
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    aws-eventstream (1.1.0)
-    aws-partitions (1.338.0)
-    aws-sdk-apigateway (1.48.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-partitions (1.386.0)
+    aws-sdk-apigateway (1.55.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.23.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-apigatewayv2 (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.30.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-athena (1.33.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-autoscaling (1.22.0)
      aws-sdk-core (~> 3, >= 3.52.1)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.32.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-budgets (1.36.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.41.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudformation (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.33.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudfront (1.46.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.24.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudhsm (1.27.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.26.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudhsmv2 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.26.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudtrail (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.41.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudwatch (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.34.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudwatchlogs (1.38.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.37.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-codecommit (1.40.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.34.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-codedeploy (1.37.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.34.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-codepipeline (1.37.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.48.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-configservice (1.53.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.103.0)
+    aws-sdk-core (3.109.1)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-costandusagereportservice (1.24.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-costandusagereportservice (1.28.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.51.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-dynamodb (1.55.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.174.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ec2 (1.202.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.34.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ecr (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.67.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ecs (1.70.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.32.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-efs (1.36.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.39.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-eks (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.40.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticache (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.34.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticbeanstalk (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.25.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticloadbalancing (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.47.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticloadbalancingv2 (1.53.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.39.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticsearchservice (1.43.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.31.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-firehose (1.35.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.43.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-guardduty (1.42.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.23.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-iam (1.46.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.26.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kafka (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kinesis (1.30.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.46.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-lambda (1.51.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-organizations (1.17.0)
      aws-sdk-core (~> 3, >= 3.39.0)
      aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.92.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-rds (1.104.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.46.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-redshift (1.50.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.40.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-route53 (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.25.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-route53domains (1.28.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.17.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-route53resolver (1.21.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.73.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
+    aws-sdk-s3 (1.83.1)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.29.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-securityhub (1.35.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.33.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ses (1.36.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sms (1.23.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-sms (1.27.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.27.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-sns (1.34.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.30.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-sqs (1.34.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.84.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ssm (1.95.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.2.2)
      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)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_resources (0.17.9)
+    azure_mgmt_resources (0.18.0)
      ms_rest_azure (~> 0.12.0)
    azure_mgmt_security (0.18.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.21.2)
+    azure_mgmt_storage (0.22.0)
      ms_rest_azure (~> 0.12.0)
    bcrypt_pbkdf (1.0.1)
    builder (3.2.4)
-    chef-config (16.2.73)
+    chef-config (16.6.14)
      addressable
-      chef-utils (= 16.2.73)
+      chef-utils (= 16.6.14)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
      tomlrb (~> 1.2)
-    chef-telemetry (1.0.8)
+    chef-telemetry (1.0.14)
      chef-config
      concurrent-ruby (~> 1.0)
      ffi-yajl (~> 2.2)
-    chef-utils (16.2.73)
+    chef-utils (16.6.14)
    coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
    declarative (0.0.20)
    declarative-option (0.1.0)
    diff-lcs (1.4.4)
-    docker-api (1.34.2)
+    docker-api (2.0.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
@@ -196,21 +207,20 @@ GEM
    ecma-re-validator (0.2.1)
      regexp_parser (~> 1.2)
    ed25519 (1.2.4)
-    equatable (0.6.1)
    erubi (1.9.0)
-    excon (0.75.0)
+    excon (0.78.0)
    faraday (0.17.3)
      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
    faraday_middleware (0.12.2)
      faraday (>= 0.7.4, < 1.0)
    ffi (1.13.1)
-    ffi-yajl (2.3.3)
+    ffi-yajl (2.3.4)
      libyajl2 (~> 1.2)
    fuzzyurl (0.9.0)
-    google-api-client (0.34.1)
+    google-api-client (0.44.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (~> 0.9)
      httpclient (>= 2.8.1, < 3.0)
@@ -218,40 +228,38 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
      signet (~> 0.12)
-    googleauth (0.10.0)
-      faraday (~> 0.12)
+    googleauth (0.13.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.12)
+      signet (~> 0.14)
    gssapi (1.3.0)
      ffi (>= 1.0.1)
    gyoku (1.3.1)
      builder (>= 2.1.2)
    hana (1.3.6)
    hashie (3.6.0)
-    htmlentities (4.3.4)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.8.3)
+    i18n (1.8.5)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
-    inspec (4.21.3)
+    inspec (4.22.22)
      faraday_middleware (~> 0.12.2)
-      inspec-core (= 4.21.3)
+      inspec-core (= 4.22.22)
      train (~> 3.0)
      train-aws (~> 0.1)
      train-habitat (~> 0.1)
      train-winrm (~> 0.2)
-    inspec-core (4.21.3)
+    inspec-core (4.22.22)
      addressable (~> 2.4)
      chef-telemetry (~> 1.0)
      faraday (>= 0.9.0)
      hashie (~> 3.4)
-      htmlentities (~> 4.3)
-      json_schemer (~> 0.2.1)
+      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)
@@ -264,7 +272,6 @@ GEM
      rubyzip (~> 1.2, >= 1.2.2)
      semverse (~> 3.0)
      sslshake (~> 1.2)
-      term-ansicolor (~> 1.7)
      thor (>= 0.20, < 2.0)
      tomlrb (~> 1.2.0)
      train-core (~> 3.0)
@@ -277,17 +284,15 @@ GEM
      hana (~> 1.3)
      regexp_parser (~> 1.5)
      uri_template (~> 0.7)
-    jwt (2.2.1)
-    kitchen-docker (2.10.0)
-      test-kitchen (>= 1.0.0)
-    kitchen-inspec (2.0.0)
+    jwt (2.2.2)
+    kitchen-inspec (2.2.1)
      hashie (~> 3.4)
      inspec (>= 2.2.64, < 5.0)
-      test-kitchen (>= 1.6, < 3)
+      test-kitchen (>= 2.7, < 3)
    kitchen-salt (0.6.3)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
-    kitchen-vagrant (1.6.1)
+    kitchen-vagrant (1.7.0)
      test-kitchen (>= 1.4, < 3)
    libyajl2 (1.2.0)
    license-acceptance (1.0.19)
@@ -302,15 +307,16 @@ GEM
    memoist (0.16.2)
    method_source (1.0.0)
    mini_mime (1.0.2)
-    minitest (5.14.1)
-    mixlib-config (3.0.6)
+    minitest (5.14.2)
+    mixlib-config (3.0.9)
      tomlrb
-    mixlib-install (3.12.1)
+    mixlib-install (3.12.3)
      mixlib-shellout
      mixlib-versioning
      thor
-    mixlib-log (3.0.8)
-    mixlib-shellout (3.0.9)
+    mixlib-log (3.0.9)
+    mixlib-shellout (3.1.6)
+      chef-utils
    mixlib-versioning (1.2.12)
    ms_rest (0.7.6)
      concurrent-ruby (~> 1.0)
@@ -321,26 +327,24 @@ GEM
      faraday (>= 0.9, < 2.0.0)
      faraday-cookie_jar (~> 0.0.6)
      ms_rest (~> 0.7.6)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
    multipart-post (2.1.1)
-    necromancer (0.5.1)
    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.0)
+    os (1.1.1)
    parallel (1.19.2)
    parslet (1.8.2)
-    pastel (0.7.4)
-      equatable (~> 0.6)
+    pastel (0.8.0)
      tty-color (~> 0.5)
    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (4.0.5)
-    regexp_parser (1.7.1)
+    public_suffix (4.0.6)
+    regexp_parser (1.8.2)
    representable (3.0.4)
      declarative (< 0.1.0)
      declarative-option (< 0.2.0)
@@ -350,9 +354,9 @@ GEM
      rspec-core (~> 3.9.0)
      rspec-expectations (~> 3.9.0)
      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.3)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.9.0)
    rspec-its (1.3.0)
@@ -361,7 +365,7 @@ GEM
    rspec-mocks (3.9.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+    rspec-support (3.9.4)
    rubyntlm (0.6.2)
    rubyzip (1.3.0)
    semverse (3.0.0)
@@ -371,18 +375,15 @@ GEM
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
-    strings (0.1.8)
-      strings-ansi (~> 0.1)
+    strings (0.2.0)
+      strings-ansi (~> 0.2)
      unicode-display_width (~> 1.5)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    test-kitchen (2.5.2)
+    test-kitchen (2.7.2)
      bcrypt_pbkdf (~> 1.0)
      ed25519 (~> 1.2)
-      license-acceptance (~> 1.0, >= 1.0.11)
+      license-acceptance (>= 1.0.11, < 3.0)
      mixlib-install (~> 3.6)
      mixlib-shellout (>= 1.2, < 4.0)
      net-scp (>= 1.1, < 4.0)
@@ -395,23 +396,21 @@ GEM
    thor (1.0.1)
    thread_safe (0.3.6)
    timeliness (0.3.10)
-    tins (1.25.0)
-      sync
    tomlrb (1.2.9)
-    train (3.3.6)
+    train (3.3.27)
      activesupport (>= 5.2.4.3, < 6.0.0)
      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)
-      google-api-client (>= 0.23.9, < 0.35.0)
-      googleauth (>= 0.6.6, < 0.11.0)
+      docker-api (>= 1.26, < 3.0)
+      google-api-client (>= 0.23.9, < 0.44.1)
+      googleauth (>= 0.6.6, < 0.13.1)
      inifile (~> 3.0)
-      train-core (= 3.3.6)
+      train-core (= 3.3.27)
      train-winrm (~> 0.2)
-    train-aws (0.1.17)
+    train-aws (0.1.18)
      aws-sdk-apigateway (~> 1.0)
      aws-sdk-apigatewayv2 (~> 1.0)
      aws-sdk-athena (~> 1.0)
@@ -442,6 +441,7 @@ GEM
      aws-sdk-elasticloadbalancingv2 (~> 1.0)
      aws-sdk-elasticsearchservice (~> 1.0)
      aws-sdk-firehose (~> 1.0)
+      aws-sdk-guardduty (~> 1.31)
      aws-sdk-iam (~> 1.13)
      aws-sdk-kafka (~> 1.0)
      aws-sdk-kinesis (~> 1.0)
@@ -460,7 +460,7 @@ GEM
      aws-sdk-sns (~> 1.9)
      aws-sdk-sqs (~> 1.10)
      aws-sdk-ssm (~> 1.0)
-    train-core (3.3.6)
+    train-core (3.3.27)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
@@ -468,30 +468,28 @@ GEM
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
    train-habitat (0.2.13)
-    train-winrm (0.2.6)
+    train-winrm (0.2.11)
      winrm (~> 2.0)
+      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
-    tty-box (0.5.0)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
+    tty-box (0.6.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
      tty-cursor (~> 0.7)
-    tty-color (0.5.1)
+    tty-color (0.5.2)
    tty-cursor (0.7.1)
-    tty-prompt (0.21.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
+    tty-prompt (0.22.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.8.0)
      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.8.0)
-    tty-table (0.11.0)
-      equatable (~> 0.6)
-      necromancer (~> 0.5)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.5)
-      tty-screen (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
    tzinfo (1.2.7)
      thread_safe (~> 0.1)
    uber (0.1.0)
@@ -501,7 +499,7 @@ GEM
    unicode-display_width (1.7.0)
    unicode_utils (1.4.0)
    uri_template (0.7.0)
-    winrm (2.3.4)
+    winrm (2.3.5)
      builder (>= 2.1.2)
      erubi (~> 1.8)
      gssapi (~> 1.2)
@@ -510,7 +508,7 @@ GEM
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.1)
+    winrm-elevated (1.2.2)
      erubi (~> 1.8)
      winrm (~> 2.0)
      winrm-fs (~> 1.0)
@@ -525,9 +523,10 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  kitchen-docker (>= 2.9)
-  kitchen-inspec (>= 1.1)
-  kitchen-salt (>= 0.6.0)
+  inspec (~> 4.22.22)
+  kitchen-docker!
+  kitchen-inspec (>= 2.2.1)
+  kitchen-salt (>= 0.6.3)
  kitchen-vagrant

 BUNDLED WITH
--- a/bin/install-hooks
+++ b/bin/install-hooks
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+set -o nounset # Treat unset variables as an error and immediately exit
+set -o errexit # If a command fails exit the whole script
+
+if [ "${DEBUG:-false}" = "true" ]; then
+  set -x # Run the entire script in debug mode
+fi
+
+if ! command -v pre-commit >/dev/null 2>&1; then
+  echo "pre-commit not found: please install or check your PATH" >&2
+  echo "See https://pre-commit.com/#installation" >&2
+  exit 1
+fi
+
+pre-commit install --install-hooks
+pre-commit install --hook-type commit-msg --install-hooks
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,3 +1,8 @@
 module.exports = {
    extends: ['@commitlint/config-conventional'],
+    rules: {
+        'body-max-line-length': [2, 'always', 120],
+        'footer-max-line-length': [2, 'always', 120],
+        'header-max-length': [2, 'always', 72],
+    },
 };
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,10 +15,10 @@ 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://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
     - `@myii <https://github.com/myii>`_
-     - 119
+     - 129
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 62
+     - 72
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
     - 54
@@ -67,8 +67,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://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
     - `@alxwr <https://github.com/alxwr>`_
     - 5
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyr'>`
-     - `@audreyr <https://github.com/audreyr>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyfeldroy'>`
+     - `@audreyfeldroy <https://github.com/audreyfeldroy>`_
     - 5
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>`
     - `@blast-hardcheese <https://github.com/blast-hardcheese>`_
@@ -94,6 +94,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://avatars3.githubusercontent.com/u/296940?v=4' width='36' height='36' alt='@renoirb'>`
     - `@renoirb <https://github.com/renoirb>`_
     - 3
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
+     - `@dafyddj <https://github.com/dafyddj>`_
+     - 2
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1078927?v=4' width='36' height='36' alt='@Ken-2scientists'>`
     - `@Ken-2scientists <https://github.com/Ken-2scientists>`_
     - 2
@@ -196,6 +199,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://avatars1.githubusercontent.com/u/11394644?v=4' width='36' height='36' alt='@Strade288'>`
     - `@Strade288 <https://github.com/Strade288>`_
     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>`
+     - `@sticky-note <https://github.com/sticky-note>`_
+     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
     - `@daks <https://github.com/daks>`_
     - 1
@@ -203,4 +209,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 2020-07-10.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-12-16.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,60 @@
 Changelog
 =========

+`0.41.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.3...v0.41.4>`_ (2020-12-16)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **archlinux:** avoid nonetype error (\ `0a6cf8f <https://github.com/saltstack-formulas/postgres-formula/commit/0a6cf8fefae1bbd5668a447ced911088ac965475>`_\ )
+* **archlinux:** use consistent jinja repo check (\ `3a955e0 <https://github.com/saltstack-formulas/postgres-formula/commit/3a955e02708b23929c93f879bcba0e3fe5ae5666>`_\ )
+* **jinja:** syntax correction (\ `8b44c06 <https://github.com/saltstack-formulas/postgres-formula/commit/8b44c068fcfd4199336596bdba095fc0e6c8fb2e>`_\ )
+* **python:** use python3 postres on cent7/8 (\ `d6d1068 <https://github.com/saltstack-formulas/postgres-formula/commit/d6d1068395131de08534e387d377389bd078d3ee>`_\ )
+* **suse:** version 11+ repo support on suse (\ `b3f381e <https://github.com/saltstack-formulas/postgres-formula/commit/b3f381e54750a00bb19a4aa50c6273c627dca16c>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **gitlab-ci:** use GitLab CI as Travis CI replacement (\ `a45673a <https://github.com/saltstack-formulas/postgres-formula/commit/a45673a87892deb973afee3689aea4bebd7a5739>`_\ )
+* **pre-commit:** add to formula [skip ci] (\ `db1794b <https://github.com/saltstack-formulas/postgres-formula/commit/db1794b6bbb6ce183e5231cb4b7e7193dcb80143>`_\ )
+* **pre-commit:** enable/disable ``rstcheck`` as relevant [skip ci] (\ `f04d60a <https://github.com/saltstack-formulas/postgres-formula/commit/f04d60a773461dce98b4f2a7c8abbbab268513a0>`_\ )
+* **pre-commit:** finalise ``rstcheck`` configuration [skip ci] (\ `7036f60 <https://github.com/saltstack-formulas/postgres-formula/commit/7036f60e8ca3857beeca18abe70a3c59b6a021ec>`_\ )
+
+`0.41.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.2...v0.41.3>`_ (2020-09-29)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **upstream:** require_in/require use_upstream (\ `ab6b97e <https://github.com/saltstack-formulas/postgres-formula/commit/ab6b97e8c3ff40f9cb2e629c3c0faf09ca59ede9>`_\ )
+
+`0.41.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.1...v0.41.2>`_ (2020-07-27)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **macros:** fix ``format_kwargs`` macro (\ `5e6511b <https://github.com/saltstack-formulas/postgres-formula/commit/5e6511b783388930010e6c0795b197728fb10b39>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** ubuntu-2004-master-py3 added (\ `7978976 <https://github.com/saltstack-formulas/postgres-formula/commit/79789765439bb0727521dc817fe9eaebba000a67>`_\ )
+* **kitchen+travis:** use latest pre-salted images [skip ci] (\ `702323c <https://github.com/saltstack-formulas/postgres-formula/commit/702323c24df1df6b11defd663b55cf38586bd3f3>`_\ )
+* **travis:** ubuntu upgrade from 16 to 18 & 20 (\ `44568a6 <https://github.com/saltstack-formulas/postgres-formula/commit/44568a680602fb61f157b74dc05f9af9b153e8e6>`_\ )
+
+Styles
+^^^^^^
+
+
+* **libtofs.jinja:** use Black-inspired Jinja formatting [skip ci] (\ `8735cf8 <https://github.com/saltstack-formulas/postgres-formula/commit/8735cf8ad1b9fc1eb816aecf3d363d4fc81fbe66>`_\ )
+
 `0.41.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.0...v0.41.1>`_ (2020-07-10)
 -------------------------------------------------------------------------------------------------------------

--- a/docs/TOFS_pattern.rst
+++ b/docs/TOFS_pattern.rst
@@ -64,7 +64,7 @@ Example: NTP before applying TOFS

 Let's work with the NTP example. A basic formula that follows the `design guidelines <http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_ has the following files and directories tree:

-.. code-block::
+.. code-block:: console

   /srv/saltstack/salt-formulas/ntp-saltstack-formula/
     ntp/
@@ -226,7 +226,7 @@ We can make different templates coexist for different minions, classified by any

 If we decide that we want ``os_family`` as switch, then we could provide the formula template variants for both the ``RedHat`` and ``Debian`` families.

-.. code-block::
+.. code-block:: console

   /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/
     default/
@@ -449,7 +449,7 @@ Using sub-directories for ``components``

 If your formula is composed of several components, you may prefer to provides files under sub-directories, like in the `systemd-formula <https://github.com/saltstack-formulas/systemd-formula>`_.

-.. code-block::
+.. code-block:: console

   /srv/saltstack/systemd-formula/
     systemd/
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -15,20 +15,26 @@ platforms:
  - name: debian-10-master-py3
    driver:
      image: saltimages/salt-master-py3:debian-10
+  - name: ubuntu-2004-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-20.04
  - name: ubuntu-1804-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-18.04
  - name: centos-8-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-8
+  - name: fedora-32-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-32
  - name: fedora-31-master-py3
    driver:
      image: saltimages/salt-master-py3:fedora-31
-  - name: opensuse-leap-151-master-py3
+  - name: opensuse-leap-152-master-py3
    driver:
-      image: netmanagers/salt-master-py3:opensuse-leap-15.1
+      image: saltimages/salt-master-py3:opensuse-leap-15.2
      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
@@ -36,6 +42,47 @@ platforms:
    driver:
      image: saltimages/salt-master-py3:amazonlinux-2

+  ## SALT `3000.3`
+  - name: debian-10-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:debian-10
+  - name: debian-9-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:debian-9
+  - name: ubuntu-1804-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:ubuntu-18.04
+  - name: centos-8-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:centos-8
+  - name: centos-7-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:centos-7
+  - name: fedora-31-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:fedora-31
+  - name: opensuse-leap-152-3000-3-py3
+    driver:
+      image: saltimages/salt-3000.3-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-3-py3
+    driver:
+      image: saltimages/salt-3000.3-py3:amazonlinux-2
+  - name: ubuntu-1804-3000-3-py2
+    driver:
+      image: saltimages/salt-3000.3-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-3-py2
+    driver:
+      image: saltimages/salt-3000.3-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-3-py2
+    driver:
+      image: saltimages/salt-3000.3-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+
  ## SALT `2019.2`
  - name: debian-10-2019-2-py3
    driver:
@@ -46,92 +93,42 @@ platforms:
  - name: ubuntu-1804-2019-2-py3
    driver:
      image: saltimages/salt-2019.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:ubuntu-16.04
  - name: centos-8-2019-2-py3
    driver:
      image: saltimages/salt-2019.2-py3:centos-8
+  - name: centos-7-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:centos-7
  - name: fedora-31-2019-2-py3
    driver:
      image: saltimages/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-151-2019-2-py3
+  - name: opensuse-leap-152-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
+      image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # 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: centos-7-2019-2-py2
-    driver:
-      image: netmanagers/salt-2019.2-py2:centos-7
  - name: amazonlinux-2-2019-2-py3
    driver:
      image: saltimages/salt-2019.2-py3:amazonlinux-2
+  - name: centos-6-2019-2-py2
+    driver:
+      image: saltimages/salt-2019.2-py2:centos-6
+      run_command: /sbin/init
+  - name: amazonlinux-1-2019-2-py2
+    driver:
+      image: saltimages/salt-2019.2-py2:amazonlinux-1
+      run_command: /sbin/init
  - name: arch-base-latest-2019-2-py2
    driver:
      image: saltimages/salt-2019.2-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd

-  ## SALT `2018.3`
-  - name: fedora-30-2018-3-py3
-    driver:
-      image: netmanagers/salt-2018.3-py3:fedora-30
-  - name: debian-9-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:debian-9
-  - name: ubuntu-1604-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
-  - name: centos-7-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:centos-7
-  - name: opensuse-leap-151-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-1-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:amazonlinux-1
-      run_command: /sbin/init
-  - name: arch-base-latest-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `2017.7`
-  - name: debian-8-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:debian-8
-  - name: ubuntu-1604-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:ubuntu-16.04
-  - name: centos-6-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:centos-6
-      run_command: /sbin/init
-  - name: fedora-30-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:fedora-30
-  - name: opensuse-leap-151-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-1-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:amazonlinux-1
-      run_command: /sbin/init
-  - name: arch-base-latest-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
 provisioner:
  name: salt_solo
  log_level: debug
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -6,7 +6,7 @@
 postgres:
  use_upstream_repo: true
  add_profile: false  # add bin_dir to $PATH, if installed from repos
-  version: '10'
+  version: '11'
  pkg: postgresql
  pkgs_extra: []
  pkgs_deps: []
--- a/postgres/libtofs.jinja
+++ b/postgres/libtofs.jinja
@@ -1,40 +1,37 @@
-{%- macro files_switch(source_files,
+{%- macro files_switch(
+      source_files,
      lookup=None,
-                       default_files_switch=['id', 'os_family'],
+      default_files_switch=["id", "os_family"],
      indent_width=6,
-                       use_subpath=False) %}
-  {#-
+      use_subpath=False
+    ) %}
+{#-
    Returns a valid value for the "source" parameter of a "file.managed"
    state function. This makes easier the usage of the Template Override and
    Files Switch (TOFS) pattern.
-
    Params:
      * source_files: ordered list of files to look for
-      * lookup: key under '<tplroot>:tofs:source_files' to prepend to the
+      * lookup: key under "<tplroot>:tofs:source_files" to prepend to the
        list of source files
      * default_files_switch: if there's no config (e.g. pillar)
-        '<tplroot>:tofs:files_switch' this is the ordered list of grains to
+        "<tplroot>:tofs:files_switch" this is the ordered list of grains to
        use as selector switch of the directories under
        "<path_prefix>/files"
      * indent_width: indentation of the result value to conform to YAML
      * use_subpath: defaults to `False` but if set, lookup the source file
        recursively from the current state directory up to `tplroot`
-
    Example (based on a `tplroot` of `xxx`):
-
    If we have a state:
-
      Deploy configuration:
        file.managed:
          - name: /etc/yyy/zzz.conf
-          - source: {{ files_switch(['/etc/yyy/zzz.conf', '/etc/yyy/zzz.conf.jinja'],
-                                    lookup='Deploy configuration'
+          - source: {{ files_switch(
+                         ["/etc/yyy/zzz.conf", "/etc/yyy/zzz.conf.jinja"],
+                         lookup="Deploy configuration",
                       ) }}
          - template: jinja
-
    In a minion with id=theminion and os_family=RedHat, it's going to be
    rendered as:
-
      Deploy configuration:
        file.managed:
          - name: /etc/yyy/zzz.conf
@@ -46,67 +43,73 @@
            - salt://xxx/files/default/etc/yyy/zzz.conf
            - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
          - template: jinja
-  #}
-  {#- Get the `tplroot` from `tpldir` #}
-  {%- set tplroot = tpldir.split('/')[0] %}
-  {%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %}
-  {%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %}
-  {%- set files_switch_list = salt['config.get'](
-      tplroot ~ ':tofs:files_switch',
-      default_files_switch
+#}
+{#-   Get the `tplroot` from `tpldir` #}
+{%-   set tplroot = tpldir.split("/")[0] %}
+{%-   set path_prefix = salt["config.get"](tplroot ~ ":tofs:path_prefix", tplroot) %}
+{%-   set files_dir = salt["config.get"](tplroot ~ ":tofs:dirs:files", "files") %}
+{%-   set files_switch_list = salt["config.get"](
+        tplroot ~ ":tofs:files_switch", default_files_switch
      ) %}
-  {#- Lookup source_files (v2), files (v1), or fallback to an empty list #}
-  {%- set src_files = salt['config.get'](
-      tplroot ~ ':tofs:source_files:' ~ lookup,
-      salt['config.get'](tplroot ~ ':tofs:files:' ~ lookup, [])
+{#-   Lookup source_files (v2), files (v1), or fallback to an empty list #}
+{%-   set src_files = salt["config.get"](
+        tplroot ~ ":tofs:source_files:" ~ lookup,
+        salt["config.get"](tplroot ~ ":tofs:files:" ~ lookup, []),
      ) %}
-  {#- Append the default source_files #}
-  {%- set src_files = src_files + source_files %}
-  {#- Only add to [''] when supporting older TOFS implementations #}
-  {%- set path_prefix_exts = [''] %}
-  {%- if use_subpath and tplroot != tpldir %}
-    {#- Walk directory tree to find {{ files_dir }} #}
-    {%- set subpath_parts = tpldir.lstrip(tplroot).lstrip('/').split('/') %}
-    {%- for path in subpath_parts %}
-      {%- set subpath = subpath_parts[0:loop.index] | join('/') %}
-      {%- do path_prefix_exts.append('/' ~ subpath) %}
-    {%- endfor %}
-  {%- endif %}
-  {%- for path_prefix_ext in path_prefix_exts|reverse %}
-    {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
-    {#- For older TOFS implementation, use `files_switch` from the config #}
-    {#- Use the default, new method otherwise #}
-    {%- set fsl = salt['config.get'](
-        tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch',
-        files_switch_list
+{#-   Append the default source_files #}
+{%-   set src_files = src_files + source_files %}
+{#-   Only add to [""] when supporting older TOFS implementations #}
+{%-   set path_prefix_exts = [""] %}
+{%-   if use_subpath and tplroot != tpldir %}
+{#-     Walk directory tree to find {{ files_dir }} #}
+{%-     set subpath_parts = tpldir.lstrip(tplroot).lstrip("/").split("/") %}
+{%-     for path in subpath_parts %}
+{%-       set subpath = subpath_parts[0 : loop.index] | join("/") %}
+{%-       do path_prefix_exts.append("/" ~ subpath) %}
+{%-     endfor %}
+{%-   endif %}
+{%-   for path_prefix_ext in path_prefix_exts | reverse %}
+{%-     set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
+{#-     For older TOFS implementation, use `files_switch` from the config #}
+{#-     Use the default, new method otherwise #}
+{%-     set fsl = salt["config.get"](
+          tplroot ~ path_prefix_ext | replace("/", ":") ~ ":files_switch",
+          files_switch_list,
+        ) %}
+{#-     Append an empty value to evaluate as `default` in the loop below #}
+{%-     if "" not in fsl %}
+{%-       set fsl = fsl + [""] %}
+{%-     endif %}
+{%-     for fs in fsl %}
+{%-       for src_file in src_files %}
+{%-         if fs %}
+{%-           set fs_dirs = salt["config.get"](fs, fs) %}
+{%-         else %}
+{%-           set fs_dirs = salt["config.get"](
+                tplroot ~ ":tofs:dirs:default", "default"
+              ) %}
+{%-         endif %}
+{#-         Force the `config.get` lookup result as a list where necessary #}
+{#-         since we need to also handle grains that are lists #}
+{%-         if fs_dirs is string %}
+{%-           set fs_dirs = [fs_dirs] %}
+{%-         endif %}
+{%-         for fs_dir in fs_dirs %}
+{#-           strip empty elements by using a select #}
+{%-           set url = (
+                [
+                  "- salt:/",
+                  path_prefix_inc_ext.strip("/"),
+                  files_dir.strip("/"),
+                  fs_dir.strip("/"),
+                  src_file.strip("/"),
+                ]
+                | select
+                | join("/")
              ) %}
-    {#- Append an empty value to evaluate as `default` in the loop below #}
-    {%- if '' not in fsl %}
-      {%- set fsl = fsl + [''] %}
-    {%- endif %}
-    {%- for fs in fsl %}
-      {%- for src_file in src_files %}
-        {%- if fs %}
-          {%- set fs_dirs = salt['config.get'](fs, fs) %}
-        {%- else %}
-          {%- set fs_dirs = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
-        {%- endif %}
-        {#- Force the `config.get` lookup result as a list where necessary #}
-        {#- since we need to also handle grains that are lists #}
-        {%- if fs_dirs is string %}
-          {%- set fs_dirs = [fs_dirs] %}
-        {%- endif %}
-        {%- for fs_dir in fs_dirs %}
-          {%- set url = [
-              '- salt:/',
-              path_prefix_inc_ext.strip('/'),
-              files_dir.strip('/'),
-              fs_dir.strip('/'),
-              src_file.strip('/'),
-          ] | select | join('/') %}
 {{ url | indent(indent_width, true) }}
-        {%- endfor %}
-      {%- endfor %}
-    {%- endfor %}
-  {%- endfor %}
+{%-         endfor %}
+{%-       endfor %}
+{%-     endfor %}
+{%-   endfor %}
 {%- endmacro %}
--- a/postgres/macros.jinja
+++ b/postgres/macros.jinja
@@ -4,7 +4,7 @@

  {%- filter indent(4) %}
    {%- for k, v in kwarg|dictsort() %}
- {{ k }}: {{ v }}
+- {{ k }}: {{ v|yaml_dquote if v is string else v }}
    {%- endfor %}
  {%- endfilter %}

--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -6,6 +6,7 @@
 {% set release = repo.version|replace('.', '') %}

 Arch:
+  use_upstream_repo: false
  conf_dir: /var/lib/postgres/data
  data_dir: /var/lib/postgres/data
  pkg_client: postgresql-libs
@@ -62,6 +63,10 @@ RedHat:
    gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'

+{%- if grains.get('osmajorrelease', 0) >= 7 %}
+  pkg_python: python3-psycopg2
+{%- endif %}
+
 {% if repo.use_upstream_repo == true %}
  {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}

@@ -135,9 +140,9 @@ Suse:
  pkg_repo:
    name: pgdg-sles-{{ release }}
    humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
-    #Using sles-12 upstream repo for opensuse
-    baseurl: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-12-$basearch'
-    key_url: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-12-$basearch/repodata/repomd.xml.key'
+    # works for postgres 11 onwards
+    baseurl: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-$releasever-$basearch'
+    key_url: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-$releasever-$basearch/repodata/repomd.xml.key'
    gpgcheck: 1
    gpgautoimport: True

--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -20,8 +20,6 @@ postgresql-server:
    - pkgs: {{ pkgs | json }}
 {%- if postgres.use_upstream_repo == true %}
    - refresh: True
-    - require:
-      - pkgrepo: postgresql-repo
 {%- endif %}
  {%- if postgres.fromrepo %}
    - fromrepo: {{ postgres.fromrepo }}
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -28,6 +28,8 @@ postgresql-repo:
    {{- format_kwargs(postgres.pkg_repo) }}
    - require:
      - pkg: postgresql-pkg-deps
+    - require_in:
+      - pkg: postgresql-server

  {%- else -%}

--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@@ -11,7 +11,7 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
 ###############################################################################

 # Install `m2r`
-sudo -H pip install m2r
+pip3 install m2r

 # Copy and then convert the `.md` docs
 cp ./*.md docs/
--- a/release.config.js
+++ b/release.config.js
@@ -1,5 +1,6 @@
 module.exports = {
  branch: 'master',
+  repositoryUrl: 'https://github.com/saltstack-formulas/postgres-formula',
  plugins: [
      ['@semantic-release/commit-analyzer', {
        preset: 'angular',
Author	SHA1	Message	Date
semantic-release-bot	062399fc16	chore(release): 0.41.4 [skip ci] ## [0.41.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.3...v0.41.4) (2020-12-16) ### Bug Fixes * archlinux: avoid nonetype error ([`0a6cf8f`](`0a6cf8fefa`)) * archlinux: use consistent jinja repo check ([`3a955e0`](`3a955e0270`)) * jinja: syntax correction ([`8b44c06`](`8b44c068fc`)) * python: use python3 postres on cent7/8 ([`d6d1068`](`d6d1068395`)) * suse: version 11+ repo support on suse ([`b3f381e`](`b3f381e547`)) ### Continuous Integration * gitlab-ci: use GitLab CI as Travis CI replacement ([`a45673a`](`a45673a878`)) * pre-commit: add to formula [skip ci] ([`db1794b`](`db1794b6bb`)) * pre-commit: enable/disable `rstcheck` as relevant [skip ci] ([`f04d60a`](`f04d60a773`)) * pre-commit: finalise `rstcheck` configuration [skip ci] ([`7036f60`](`7036f60e8c`))	2020-12-16 06:51:15 +00:00
Imran Iqbal	a45673a878	ci(gitlab-ci): use GitLab CI as Travis CI replacement * Automated using https://github.com/myii/ssf-formula/pull/275	2020-12-16 06:38:36 +00:00
N	f589e96824	Merge pull request #303 from noelmcloughlin/suse fix(suse): version 11+ repo support on suse	2020-12-08 10:53:53 +00:00
N	44ac9ff9d4	Merge pull request #306 from noelmcloughlin/pkg fix(archlinux): avoid nonetype error when grain is missing	2020-12-07 10:24:36 +00:00
noelmcloughlin	0a6cf8fefa	fix(archlinux): avoid nonetype error	2020-12-05 23:30:03 +00:00
N	150926401e	Merge pull request #304 from noelmcloughlin/archlinux feat(archlinux): add support	2020-12-05 13:45:46 +00:00
N	e4900b47a1	Merge pull request #305 from noelmcloughlin/pkg fix(jinja): syntax correction	2020-12-04 14:44:55 +00:00
noelmcloughlin	8b44c068fc	fix(jinja): syntax correction	2020-12-04 14:04:56 +00:00
N	d6a6444e0d	Merge pull request #301 from noelmcloughlin/pkg fix(python): use python3 postgres on cent7/8	2020-12-04 09:43:02 +00:00
noelmcloughlin	3a955e0270	fix(archlinux): use consistent jinja repo check	2020-12-03 18:43:42 +00:00
noelmcloughlin	d6d1068395	fix(python): use python3 postres on cent7/8	2020-12-03 11:58:31 +00:00
noelmcloughlin	b3f381e547	fix(suse): version 11+ repo support on suse	2020-12-02 23:33:09 +00:00
Imran Iqbal	5b9de35c59	chore(gemfile+lock): update to latest gem versions (2020-W44) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/274	2020-10-26 22:52:52 +00:00
Imran Iqbal	8332a5de2e	chore(gemfile+lock): update to latest gem versions (2020-W43) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/273	2020-10-20 10:20:51 +01:00
Imran Iqbal	7036f60e8c	ci(pre-commit): finalise `rstcheck` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/267	2020-10-10 06:50:58 +01:00
Dafydd Jones	d3d86ba2b7	chore(commitlint): add `{body,footer,header}-max(-line)-length` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/265	2020-10-07 09:09:01 +01:00
Imran Iqbal	6f73123e18	chore(gemfile+lock): update to latest gem versions (2020-W41) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/263	2020-10-07 00:07:20 +01:00
Imran Iqbal	f04d60a773	ci(pre-commit): enable/disable `rstcheck` as relevant [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/262	2020-10-05 00:23:30 +01:00
Dafydd Jones	db1794b6bb	ci(pre-commit): add to formula [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/259	2020-10-03 10:52:11 +01:00
semantic-release-bot	07e15d83e5	chore(release): 0.41.3 [skip ci] ## [0.41.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.2...v0.41.3) (2020-09-29) ### Bug Fixes * upstream: require_in/require use_upstream ([`ab6b97e`](`ab6b97e8c3`))	2020-09-29 01:20:32 +00:00
sticky-note	a53b921663	Merge pull request #300 from jle35/require/pkgrepo fix(upstream): require_in/require use_upstream	2020-09-29 12:11:32 +11:00
Julien Levieil	ab6b97e8c3	fix(upstream): require_in/require use_upstream	2020-09-29 10:55:31 +11:00
semantic-release-bot	50808e8efe	chore(release): 0.41.2 [skip ci] ## [0.41.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.1...v0.41.2) (2020-07-27) ### Bug Fixes * macros: fix `format_kwargs` macro ([`5e6511b`](`5e6511b783`)) ### Continuous Integration * kitchen: ubuntu-2004-master-py3 added ([`7978976`](`7978976543`)) * kitchen+travis: use latest pre-salted images [skip ci] ([`702323c`](`702323c24d`)) * travis: ubuntu upgrade from 16 to 18 & 20 ([`44568a6`](`44568a6806`)) ### Styles * libtofs.jinja: use Black-inspired Jinja formatting [skip ci] ([`8735cf8`](`8735cf8ad1`))	2020-07-27 01:27:06 +00:00
Imran Iqbal	21baf28b2f	Merge pull request #296 from sticky-note/fix/pwd fix(macros): fix `format_kwargs` macro	2020-07-27 02:18:48 +01:00
sticky-note	5e6511b783	fix(macros): fix `format_kwargs` macro	2020-07-27 11:14:24 +11:00
Imran Iqbal	702323c24d	ci(kitchen+travis): use latest pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/238	2020-07-20 05:31:49 +01:00
Imran Iqbal	8735cf8ad1	style(libtofs.jinja): use Black-inspired Jinja formatting [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/237	2020-07-19 23:28:10 +01:00
Imran Iqbal	3a3d24a735	Merge pull request #299 from litnialex/master ci(travis): Ubuntu upgrade from 16 to 18 & 20	2020-07-15 20:38:54 +01:00
LitniAlex	7978976543	ci(kitchen): ubuntu-2004-master-py3 added	2020-07-15 05:39:30 +03:00
LitniAlex	44568a6806	ci(travis): ubuntu upgrade from 16 to 18 & 20	2020-07-15 05:14:02 +03:00