chore(release): 0.41.5 [skip ci]

## [0.41.5](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.4...v0.41.5) (2021-01-07) ### Bug Fixes * **cent7:** postgres11 needs libicu installed ([4c0f796](4c0f796f00)) ### Continuous Integration * **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([e84389d](e84389dbb3)) * **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([2615411](2615411ec0))
Merge pull request #308 from noelmcloughlin/cent7
2021-01-07 23:00:14 +00:00 · 2021-01-07 22:54:20 +00:00 · 2021-01-07 11:47:08 +00:00 · 2020-12-20 18:48:48 +00:00 · 2020-12-19 14:34:25 +00:00 · 2020-12-16 06:51:15 +00:00
46 changed files with 2021 additions and 517 deletions
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -0,0 +1,16 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 name: Commitlint
 'on': [pull_request]
 jobs:
  lint:
    runs-on: ubuntu-latest
    env:
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
      - uses: actions/checkout@v2
        with:
          fetch-depth: 0
      - uses: wagoid/commitlint-github-action@v1
--- a/.gitignore
+++ b/.gitignore
@@ -105,7 +105,7 @@ ENV/
 .mypy_cache/
 # Bundler
-Gemfile.lock
+.bundle/
 # copied `.md` files used for conversion to `.rst` using `m2r`
 docs/*.md
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,171 @@
 # -*- 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_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
  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
       https://gitlab.com/saltstack-formulas/postgres-formula.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'
 # Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
 # - The `pre-commit` check will only be available for formulas that pass the default
 #   `rubocop` check -- and must continue to do so
 # - This job is allowed to fail, so can be used for all formulas
 # - Furthermore, this job uses all of the latest `rubocop` features & cops,
 #   which will help when upgrading the `rubocop` linter used in `pre-commit`
 rubocop:
  allow_failure: true
  stage: *stage_lint
  image: *image_rubocop
  script:
    - 'rubocop -d -P -S --enable-pending-cops'
 ###############################################################################
 # 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/.rubocop.yml
+++ b/.rubocop.yml
@@ -0,0 +1,16 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 # General overrides used across formulas in the org
 Layout/LineLength:
  # Increase from default of `80`
  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
  Max: 88
 Metrics/BlockLength:
  ExcludedMethods:
    - control
    - describe
  # Increase from default of `25`
  Max: 30
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
--- a/.salt-lint
+++ b/.salt-lint
@@ -0,0 +1,14 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 exclude_paths: []
 rules: {}
 skip_list:
  # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
  - 205  # Use ".sls" as a Salt State file extension
  # Skipping `207` and `208` because `210` is sufficient, at least for the time-being
  # I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
  - 207  # File modes should always be encapsulated in quotation marks
  - 208  # File modes should always contain a leading zero
 tags: []
 verbosity: 1
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,66 +1,127 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-stages:
+################################################################################
-  - test
+# NOTE: This file is UNMAINTAINED; it is provided for references purposes only.
-  - commitlint
+#       No guarantees are tendered that this structure will work after 2020.
-  - name: release
+################################################################################
-    if: branch = master AND type != pull_request
+# * 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'
 dist: 'bionic'
 version: '~> 1.0'
-sudo: required
+## Language and cache config
-cache: bundler
+language: 'ruby'
-language: ruby
+cache: 'bundler'
 dist: xenial
 ## Services config
 services:
  - docker
-# Make sure the instances listed below match up with
+## Script to run for the test stage
 # the `platforms` defined in `kitchen.yml`
 env:
  matrix:
    - INSTANCE: default-debian-9-develop-py3
    # TODO: Re-enable this once the `systemd` service can be restarted reliably
    # - INSTANCE: default-ubuntu-1804-develop-py3
    # - INSTANCE: default-centos-7-develop-py3
    # - INSTANCE: default-fedora-29-develop-py3
    # - INSTANCE: default-opensuse-leap-15-develop-py3
    # - INSTANCE: default-debian-9-2019-2-py3
    # TODO: Re-enable this once the `systemd` service can be restarted reliably
    # - INSTANCE: default-ubuntu-1804-2019-2-py3
    - INSTANCE: default-centos-7-2019-2-py3
    - INSTANCE: default-fedora-29-2019-2-py3
    # - INSTANCE: default-opensuse-leap-15-2019-2-py3
    # - INSTANCE: default-debian-9-2018-3-py2
    - INSTANCE: default-ubuntu-1604-2018-3-py2
    # - INSTANCE: default-centos-7-2018-3-py2
    # - INSTANCE: default-fedora-29-2018-3-py2
    - INSTANCE: default-opensuse-leap-42-2018-3-py2
    # - INSTANCE: default-debian-8-2017-7-py2
    # - INSTANCE: default-ubuntu-1604-2017-7-py2
    - INSTANCE: default-centos-6-2017-7-py2
    # - INSTANCE: default-fedora-28-2017-7-py2
    # - INSTANCE: default-opensuse-leap-42-2017-7-py2
 script:
-  - bin/kitchen verify ${INSTANCE}
+  - bin/kitchen verify "${INSTANCE}"
 ## Stages and jobs matrix
 stages:
  - test
  # # 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 commitlint stage
+    ## Define the test stage that runs the linters (and testing matrix, if applicable)
-    - stage: commitlint
+
-      language: node_js
+    # Run all of the linters in a single job
-      node_js: lts/*
+    - language: 'node_js'
-      before_install: skip
+      node_js: 'lts/*'
      env: 'Lint'
      name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
      before_install: 'skip'
      script:
-        - npm install @commitlint/config-conventional -D
+        # Install and run `salt-lint`
-        - npm install @commitlint/travis-cli -D
+        - pip install --user salt-lint
        - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst'
                        | xargs salt-lint
        # Install and run `yamllint`
        # Need at least `v1.17.0` for the `yaml-files` setting
        - pip install --user yamllint>=1.17.0
        - yamllint -s .
        # Install and run `rubocop`
        - gem install rubocop
        - rubocop -d
        # Run `shellcheck` (already pre-installed in Travis)
        - shellcheck --version
        - git ls-files -- '*.sh' '*.bash' '*.ksh'
                        | xargs shellcheck
        # Install and run `commitlint`
        - npm i -D @commitlint/config-conventional
                   @commitlint/travis-cli
        - commitlint-travis
-    # Define the release stage that runs semantic-release
+
-    - stage: release
+    # Run `pre-commit` linters in a single job
-      language: node_js
+    - language: 'python'
-      node_js: lts/*
+      env: 'Lint_pre-commit'
-      before_install: skip
+      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-fedora-32-master-py3
    # - env: INSTANCE=default-fedora-31-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-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-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'
      language: 'node_js'
      node_js: 'lts/*'
      env: 'Release'
      name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
      before_install: 'skip'
      script:
        # Update `AUTHORS.md`
        - export MAINTAINER_TOKEN=${GH_TOKEN}
@@ -68,12 +129,26 @@ jobs:
        - maintainer contributor
        # Install all dependencies required for `semantic-release`
-        - npm install @semantic-release/changelog@3 -D
+        - npm i -D @semantic-release/changelog@3
-        - npm install @semantic-release/exec@3 -D
+                   @semantic-release/exec@3
-        - npm install @semantic-release/git@7 -D
+                   @semantic-release/git@7
      deploy:
-        provider: script
+        provider: 'script'
-        skip_cleanup: true
+        # Opt-in to `dpl v2` to complete the Travis build config validation (beta)
-        script:
+        # * https://docs.travis-ci.com/user/build-config-validation
-          # Run `semantic-release`
+        # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
-          - npx semantic-release@15
+        edge: true
        # Run `semantic-release`
        script: 'npx semantic-release@15.14'
 # Notification options: `always`, `never` or `change`
 notifications:
  webhooks:
    if: 'repo = saltstack-formulas/postgres-formula'
    urls:
      - https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Fpostgres-formula&ignore_pull_requests=true
    on_success: always  # default: always
    on_failure: always  # default: always
    on_start: always    # default: never
    on_cancel: always   # default: always
    on_error: always    # default: always
--- a/.yamllint
+++ b/.yamllint
@@ -0,0 +1,44 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 # Extend the `default` configuration provided by `yamllint`
 extends: default
 # Files to ignore completely
 # 1. All YAML files under directory `node_modules/`, introduced during the Travis run
 # 2. Any SLS files under directory `test/`, which are actually state files
 # 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/
  pillar.example
  postgres/codenamemap.yaml
  postgres/osfamilymap.yaml
  postgres/osmap.yaml
  postgres/repo.yaml
  test/salt/pillar/postgres.sls
 yaml-files:
  # Default settings
  - '*.yaml'
  - '*.yml'
  - .salt-lint
  - .yamllint
  # SaltStack Formulas additional settings
  - '*.example'
  - test/**/*.sls
 rules:
  empty-values:
    forbid-in-block-mappings: true
    forbid-in-flow-mappings: true
  line-length:
    # Increase from default of `80`
    # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
    max: 88
  octal-values:
    forbid-implicit-octal: true
    forbid-explicit-octal: true
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,16 +4,16 @@ 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://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|58
+<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)|131
-<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)|50
+<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)|74
-<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)|48
+<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://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
 <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
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|19
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|18
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|11
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|9
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>|[@dferrantelli](https://github.com/dferrantelli)|8
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferramosi'>|[@dferramosi](https://github.com/dferramosi)|8
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|8
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|8
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|8
@@ -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,13 +31,14 @@ 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
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/6415605?v=4' width='36' height='36' alt='@tgoodaire'>|[@tgoodaire](https://github.com/tgoodaire)|2
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/26276?v=4' width='36' height='36' alt='@durana'>|[@durana](https://github.com/durana)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1922124?v=4' width='36' height='36' alt='@bebosudo'>|[@bebosudo](https://github.com/bebosudo)|1
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@coffee-powered-coder'>|[@coffee-powered-coder](https://github.com/coffee-powered-coder)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@sarcastic-coder'>|[@sarcastic-coder](https://github.com/sarcastic-coder)|1
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/458548?v=4' width='36' height='36' alt='@SuperTux88'>|[@SuperTux88](https://github.com/SuperTux88)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/36720?v=4' width='36' height='36' alt='@brot'>|[@brot](https://github.com/brot)|1
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1020898?v=4' width='36' height='36' alt='@xbglowx'>|[@xbglowx](https://github.com/xbglowx)|1
@@ -55,7 +56,6 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/219695?v=4' width='36' height='36' alt='@rmoorman'>|[@rmoorman](https://github.com/rmoorman)|1
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/154676?v=4' width='36' height='36' alt='@skurfer'>|[@skurfer](https://github.com/skurfer)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/2592431?v=4' width='36' height='36' alt='@RobRuana'>|[@RobRuana](https://github.com/RobRuana)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/3165500?v=4' width='36' height='36' alt='@rmartins90'>|[@rmartins90](https://github.com/rmartins90)|1
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10464711?v=4' width='36' height='36' alt='@sbrefort'>|[@sbrefort](https://github.com/sbrefort)|1
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/125458?v=4' width='36' height='36' alt='@sbellem'>|[@sbellem](https://github.com/sbellem)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/500703?v=4' width='36' height='36' alt='@retrry'>|[@retrry](https://github.com/retrry)|1
@@ -66,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 2019-07-24.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-01-07.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,224 @@
 # Changelog
 ## [0.41.5](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.4...v0.41.5) (2021-01-07)
 ### Bug Fixes
 * **cent7:** postgres11 needs libicu installed ([4c0f796](https://github.com/saltstack-formulas/postgres-formula/commit/4c0f796f00901b88e0ee9d778a5acb2115bf17cb))
 ### Continuous Integration
 * **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([e84389d](https://github.com/saltstack-formulas/postgres-formula/commit/e84389dbb31f04f3eeabfd3935ef193e09e5b562))
 * **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([2615411](https://github.com/saltstack-formulas/postgres-formula/commit/2615411ec019600328c330cb4e72de89472f8fc9))
 ## [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)
 ### Bug Fixes
 * **contributing:** postgresql-repo state ID requires python3-apt package ([69b57e3](https://github.com/saltstack-formulas/postgres-formula/commit/69b57e3b69062d0b66bd9fb28e3769a9ff579faa))
 * **contributing:** postgresql-service-reload type ([278893c](https://github.com/saltstack-formulas/postgres-formula/commit/278893c2f0f3fa8db26b45b3874f7dd7177b714a))
 * **contributing:** runnig formula inside container ([68a791e](https://github.com/saltstack-formulas/postgres-formula/commit/68a791ef091114b081f71631d94201a9f1ed07b6))
 * **libtofs:** “files_switch” mess up the variable exported by “map.jinja” [skip ci] ([e6b1485](https://github.com/saltstack-formulas/postgres-formula/commit/e6b14853d5ce2369ead22cabdfc48ae63f64e550))
 * **postgres.server:** reverted how posrgre.server.image is included ([07044bf](https://github.com/saltstack-formulas/postgres-formula/commit/07044bf7c1d420855b43d6add30358ff39666702))
 ### Continuous Integration
 * **gemfile:** remove unused `rspec-retry` gem [skip ci] ([85feac2](https://github.com/saltstack-formulas/postgres-formula/commit/85feac2852ee399f37293b60008e3a17d19cd47f))
 * **gemfile:** update for Vagrant testing [skip ci] ([061715e](https://github.com/saltstack-formulas/postgres-formula/commit/061715e560880a9a60720bbcbeda632c010d03a4))
 * **gemfile.lock:** add to repo with updated `Gemfile` [skip ci] ([35850da](https://github.com/saltstack-formulas/postgres-formula/commit/35850da22cb4f61144a61098b9869603b6e0a682))
 * **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([86697d8](https://github.com/saltstack-formulas/postgres-formula/commit/86697d8df48e24e37d6885f68ea8988d43b076aa))
 * **kitchen:** use `saltimages` Docker Hub where available [skip ci] ([5e29999](https://github.com/saltstack-formulas/postgres-formula/commit/5e29999495f36653aa1b51f2baf956533fdee7e4))
 * **kitchen+travis:** remove `master-py2-arch-base-latest` [skip ci] ([c46053a](https://github.com/saltstack-formulas/postgres-formula/commit/c46053abd8019a4229daf19db1af86c5f8961353))
 * **travis:** add notifications => zulip [skip ci] ([442cfec](https://github.com/saltstack-formulas/postgres-formula/commit/442cfec245fb6b22d7768c8436ba6c62ca2975fd))
 * **workflows/commitlint:** add to repo [skip ci] ([0c766c8](https://github.com/saltstack-formulas/postgres-formula/commit/0c766c8e2e336e31d44fdddf5f4c5e56faa9e40e))
 ### Documentation
 * **container:** "postgres:bake_image" specifics ([904a525](https://github.com/saltstack-formulas/postgres-formula/commit/904a5258cd155f3b5a83ec8dc8e990a8ffc6b798))
 # [0.41.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.5...v0.41.0) (2019-12-27)
 ### Bug Fixes
 * **mac_shortcut.sh:** fix `shellcheck` error ([d538798](https://github.com/saltstack-formulas/postgres-formula/commit/d538798ee4423ecb72b29bd39e4f35437412ce43))
 * **release.config.js:** use full commit hash in commit link [skip ci] ([f3ec66d](https://github.com/saltstack-formulas/postgres-formula/commit/f3ec66d5ed90bc9a458fdff2233c9a707f0c9c72))
 ### Continuous Integration
 * **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([a77bb06](https://github.com/saltstack-formulas/postgres-formula/commit/a77bb06b18823c7db0debd2c4ff135a367f76d04))
 * **kitchen:** use `develop` image until `master` is ready (`amazonlinux`) [skip ci] ([20e5e46](https://github.com/saltstack-formulas/postgres-formula/commit/20e5e46e1011641714a11756617530b898e3d689))
 * **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([8080be6](https://github.com/saltstack-formulas/postgres-formula/commit/8080be6be3dd0c8799fa102b1235fb151514bced))
 * **travis:** apply changes from build config validation [skip ci] ([8ce1ee4](https://github.com/saltstack-formulas/postgres-formula/commit/8ce1ee4ecc5dd6a6a14118eda75b3446b6f58d82))
 * **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([bd5959c](https://github.com/saltstack-formulas/postgres-formula/commit/bd5959c60a93e65ea0658f5cb7fd1609bdd3399c))
 * **travis:** quote pathspecs used with `git ls-files` [skip ci] ([0a2b63a](https://github.com/saltstack-formulas/postgres-formula/commit/0a2b63aba85b09c8983d066cbad7e344de791db1))
 * **travis:** run `shellcheck` during lint job [skip ci] ([f0d12ca](https://github.com/saltstack-formulas/postgres-formula/commit/f0d12caac67bf7f2049ca7f1b7185912e876cb02))
 * **travis:** use `major.minor` for `semantic-release` version [skip ci] ([1392538](https://github.com/saltstack-formulas/postgres-formula/commit/1392538665bea2a699836a87a6b749e07276a94d))
 * **travis:** use build config validation (beta) [skip ci] ([c9a57aa](https://github.com/saltstack-formulas/postgres-formula/commit/c9a57aa96bb80dc27c4722e0f8dc45c77460c03a))
 ### Features
 * **codenamemap:** update for current versions ([9cc95c0](https://github.com/saltstack-formulas/postgres-formula/commit/9cc95c020909563486f404b186e15ed71dd8a83a))
 ### Performance Improvements
 * **travis:** improve `salt-lint` invocation [skip ci] ([ccaf4e5](https://github.com/saltstack-formulas/postgres-formula/commit/ccaf4e5e3729c75c3a5eccbf482e7fca09415fea))
 ## [0.40.5](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.4...v0.40.5) (2019-10-28)
 ### Bug Fixes
 * **macros.jinja:** apply suggestion from PR ([](https://github.com/saltstack-formulas/postgres-formula/commit/d606b28))
 * **macros.jinja:** use `user` kwarg for schemas (required on FreeBSD) ([](https://github.com/saltstack-formulas/postgres-formula/commit/7ff798a))
 ### Continuous Integration
 * **kitchen:** add pre-salted `FreeBSD-12.0` box for local testing ([](https://github.com/saltstack-formulas/postgres-formula/commit/eefb89e))
 * **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/81b2c2e))
 * **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/62baac2))
 ### Documentation
 * **contributing:** remove to use org-level file instead [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/5a291ab))
 * **readme:** update link to `CONTRIBUTING` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/e568f28))
 ## [0.40.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.3...v0.40.4) (2019-10-11)
 ### Bug Fixes
 * **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/postgres-formula/commit/37b0c43))
 * **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/postgres-formula/commit/b369aa9))
 ### Continuous Integration
 * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/7822200))
 * **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/2c82872))
 ## [0.40.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3) (2019-10-10)
 ### Bug Fixes
 * **manage.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6))
 * **python.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc))
 ### Continuous Integration
 * **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3))
 * **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39))
 * **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/3a27978))
 * **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34))
 * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48))
 ## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13)
 ### Bug Fixes
 * **freebsd:** no libpqdev freebsd package ([eca6d97](https://github.com/saltstack-formulas/postgres-formula/commit/eca6d97))
 ### Continuous Integration
 * **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([9796319](https://github.com/saltstack-formulas/postgres-formula/commit/9796319))
 ## [0.40.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.0...v0.40.1) (2019-09-11)
 ### Continuous Integration
 * use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([fc6cbe0](https://github.com/saltstack-formulas/postgres-formula/commit/fc6cbe0))
 ### Documentation
 * **pillar.example:** update examples for freebsd ([a799214](https://github.com/saltstack-formulas/postgres-formula/commit/a799214))
 # [0.40.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.1...v0.40.0) (2019-09-03)
 ### Features
 * **archlinux:** add support, fixing rendering errors ([e970925](https://github.com/saltstack-formulas/postgres-formula/commit/e970925))
 ## [0.39.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.0...v0.39.1) (2019-09-01)
 ### Continuous Integration
 * **kitchen+travis:** replace EOL pre-salted images ([140928b](https://github.com/saltstack-formulas/postgres-formula/commit/140928b))
 ### Tests
 * **inspec:** fix reference to `suse` after gem `train` update ([677adba](https://github.com/saltstack-formulas/postgres-formula/commit/677adba))
 # [0.39.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.38.0...v0.39.0) (2019-08-17)
 ### Features
 * **yamllint:** include for this repo and apply rules throughout ([1f0fd92](https://github.com/saltstack-formulas/postgres-formula/commit/1f0fd92))
 # [0.38.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.4...v0.38.0) (2019-07-24)
--- a/44
+++ b/44
@@ -0,0 +1,44 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # SECTION: Owner(s) for everything in the repo, unless a later match takes precedence
 # FILE PATTERN                              OWNER(S)
 *                                           @vutny @myii
 # SECTION: Owner(s) for specific directories
 # FILE PATTERN                              OWNER(S)
 # 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
 /*/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
 /.yamllint                                  @saltstack-formulas/ssf
 /AUTHORS.md                                 @saltstack-formulas/ssf
 /CHANGELOG.md                               @saltstack-formulas/ssf
 /CODEOWNERS                                 @saltstack-formulas/ssf
 /commitlint.config.js                       @saltstack-formulas/ssf
 /FORMULA                                    @saltstack-formulas/ssf
 /Gemfile                                    @saltstack-formulas/ssf
 /Gemfile.lock                               @saltstack-formulas/ssf
 /kitchen.yml                                @saltstack-formulas/ssf
 /pre-commit_semantic-release.sh             @saltstack-formulas/ssf
 /release-rules.js                           @saltstack-formulas/ssf
 /release.config.js                          @saltstack-formulas/ssf
 # SECTION: Owner(s) for specific files
 # FILE PATTERN                              OWNER(S)
--- 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.38.0
+version: 0.41.5
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula
--- a/18
+++ b/18
@@ -1,6 +1,16 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
-gem 'kitchen-docker', '>= 2.9'
+source 'https://rubygems.org'
 gem 'kitchen-salt', '>= 0.6.0'
 gem 'kitchen-inspec', '>= 1.1'
 # 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'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -0,0 +1,533 @@
 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.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    aws-eventstream (1.1.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.29.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    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.36.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudformation (1.44.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudfront (1.46.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudhsm (1.27.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudhsmv2 (1.30.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudtrail (1.29.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudwatch (1.45.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudwatchlogs (1.38.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-codecommit (1.40.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-codedeploy (1.37.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-codepipeline (1.37.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-configservice (1.53.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    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.28.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-dynamodb (1.55.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ec2 (1.202.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ecr (1.39.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ecs (1.70.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-efs (1.36.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-eks (1.45.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticache (1.44.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticbeanstalk (1.39.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticloadbalancing (1.29.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticloadbalancingv2 (1.53.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-elasticsearchservice (1.43.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-firehose (1.35.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-guardduty (1.42.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-iam (1.46.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-kafka (1.29.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-kinesis (1.30.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    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.104.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-redshift (1.50.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53 (1.44.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53domains (1.28.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53resolver (1.21.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.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.35.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ses (1.36.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-sms (1.27.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-sns (1.34.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-sqs (1.34.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ssm (1.95.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.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.18.0)
      ms_rest_azure (~> 0.12.0)
    azure_mgmt_security (0.18.2)
      ms_rest_azure (~> 0.12.0)
    azure_mgmt_storage (0.22.0)
      ms_rest_azure (~> 0.12.0)
    bcrypt_pbkdf (1.0.1)
    builder (3.2.4)
    chef-config (16.6.14)
      addressable
      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.14)
      chef-config
      concurrent-ruby (~> 1.0)
      ffi-yajl (~> 2.2)
    chef-utils (16.6.14)
    coderay (1.1.3)
    concurrent-ruby (1.1.7)
    declarative (0.0.20)
    declarative-option (0.1.0)
    diff-lcs (1.4.4)
    docker-api (2.0.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
    ecma-re-validator (0.2.1)
      regexp_parser (~> 1.2)
    ed25519 (1.2.4)
    erubi (1.9.0)
    excon (0.78.0)
    faraday (0.17.3)
      multipart-post (>= 1.2, < 3)
    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.4)
      libyajl2 (~> 1.2)
    fuzzyurl (0.9.0)
    google-api-client (0.44.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (~> 0.9)
      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
      signet (~> 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.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)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    i18n (1.8.5)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
    inspec (4.22.22)
      faraday_middleware (~> 0.12.2)
      inspec-core (= 4.22.22)
      train (~> 3.0)
      train-aws (~> 0.1)
      train-habitat (~> 0.1)
      train-winrm (~> 0.2)
    inspec-core (4.22.22)
      addressable (~> 2.4)
      chef-telemetry (~> 1.0)
      faraday (>= 0.9.0)
      hashie (~> 3.4)
      json_schemer (>= 0.2.1, < 0.2.12)
      license-acceptance (>= 0.2.13, < 2.0)
      method_source (>= 0.8, < 2.0)
      mixlib-log (~> 3.0)
      multipart-post (~> 2.0)
      parallel (~> 1.9)
      parslet (~> 1.5)
      pry (~> 0.13)
      rspec (~> 3.9)
      rspec-its (~> 1.2)
      rubyzip (~> 1.2, >= 1.2.2)
      semverse (~> 3.0)
      sslshake (~> 1.2)
      thor (>= 0.20, < 2.0)
      tomlrb (~> 1.2.0)
      train-core (~> 3.0)
      tty-prompt (~> 0.17)
      tty-table (~> 0.10)
    jmespath (1.4.0)
    json (2.3.1)
    json_schemer (0.2.11)
      ecma-re-validator (~> 0.2)
      hana (~> 1.3)
      regexp_parser (~> 1.5)
      uri_template (~> 0.7)
    jwt (2.2.2)
    kitchen-inspec (2.2.1)
      hashie (~> 3.4)
      inspec (>= 2.2.64, < 5.0)
      test-kitchen (>= 2.7, < 3)
    kitchen-salt (0.6.3)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
    kitchen-vagrant (1.7.0)
      test-kitchen (>= 1.4, < 3)
    libyajl2 (1.2.0)
    license-acceptance (1.0.19)
      pastel (~> 0.7)
      tomlrb (~> 1.2)
      tty-box (~> 0.3)
      tty-prompt (~> 0.18)
    little-plugger (1.1.4)
    logging (2.3.0)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
    mini_mime (1.0.2)
    minitest (5.14.2)
    mixlib-config (3.0.9)
      tomlrb
    mixlib-install (3.12.3)
      mixlib-shellout
      mixlib-versioning
      thor
    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)
      faraday (>= 0.9, < 2.0.0)
      timeliness (~> 0.3.10)
    ms_rest_azure (0.12.0)
      concurrent-ruby (~> 1.0)
      faraday (>= 0.9, < 2.0.0)
      faraday-cookie_jar (~> 0.0.6)
      ms_rest (~> 0.7.6)
    multi_json (1.15.0)
    multipart-post (2.1.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.1)
    parallel (1.19.2)
    parslet (1.8.2)
    pastel (0.8.0)
      tty-color (~> 0.5)
    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
    public_suffix (4.0.6)
    regexp_parser (1.8.2)
    representable (3.0.4)
      declarative (< 0.1.0)
      declarative-option (< 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
    rspec (3.9.0)
      rspec-core (~> 3.9.0)
      rspec-expectations (~> 3.9.0)
      rspec-mocks (~> 3.9.0)
    rspec-core (3.9.3)
      rspec-support (~> 3.9.3)
    rspec-expectations (3.9.3)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.9.0)
    rspec-its (1.3.0)
      rspec-core (>= 3.0.0)
      rspec-expectations (>= 3.0.0)
    rspec-mocks (3.9.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.9.0)
    rspec-support (3.9.4)
    rubyntlm (0.6.2)
    rubyzip (1.3.0)
    semverse (3.0.0)
    signet (0.14.0)
      addressable (~> 2.3)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
    strings (0.2.0)
      strings-ansi (~> 0.2)
      unicode-display_width (~> 1.5)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
    test-kitchen (2.7.2)
      bcrypt_pbkdf (~> 1.0)
      ed25519 (~> 1.2)
      license-acceptance (>= 1.0.11, < 3.0)
      mixlib-install (~> 3.6)
      mixlib-shellout (>= 1.2, < 4.0)
      net-scp (>= 1.1, < 4.0)
      net-ssh (>= 2.9, < 7.0)
      net-ssh-gateway (>= 1.2, < 3.0)
      thor (>= 0.19, < 2.0)
      winrm (~> 2.0)
      winrm-elevated (~> 1.0)
      winrm-fs (~> 1.1)
    thor (1.0.1)
    thread_safe (0.3.6)
    timeliness (0.3.10)
    tomlrb (1.2.9)
    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, < 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.27)
      train-winrm (~> 0.2)
    train-aws (0.1.18)
      aws-sdk-apigateway (~> 1.0)
      aws-sdk-apigatewayv2 (~> 1.0)
      aws-sdk-athena (~> 1.0)
      aws-sdk-autoscaling (~> 1.22.0)
      aws-sdk-budgets (~> 1.0)
      aws-sdk-cloudformation (~> 1.0)
      aws-sdk-cloudfront (~> 1.0)
      aws-sdk-cloudhsm (~> 1.0)
      aws-sdk-cloudhsmv2 (~> 1.0)
      aws-sdk-cloudtrail (~> 1.8)
      aws-sdk-cloudwatch (~> 1.13)
      aws-sdk-cloudwatchlogs (~> 1.13)
      aws-sdk-codecommit (~> 1.0)
      aws-sdk-codedeploy (~> 1.0)
      aws-sdk-codepipeline (~> 1.0)
      aws-sdk-configservice (~> 1.21)
      aws-sdk-core (~> 3.0)
      aws-sdk-costandusagereportservice (~> 1.6)
      aws-sdk-dynamodb (~> 1.31)
      aws-sdk-ec2 (~> 1.70)
      aws-sdk-ecr (~> 1.18)
      aws-sdk-ecs (~> 1.30)
      aws-sdk-efs (~> 1.0)
      aws-sdk-eks (~> 1.9)
      aws-sdk-elasticache (~> 1.0)
      aws-sdk-elasticbeanstalk (~> 1.0)
      aws-sdk-elasticloadbalancing (~> 1.8)
      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)
      aws-sdk-kms (~> 1.13)
      aws-sdk-lambda (~> 1.0)
      aws-sdk-organizations (~> 1.17.0)
      aws-sdk-rds (~> 1.43)
      aws-sdk-redshift (~> 1.0)
      aws-sdk-route53 (~> 1.0)
      aws-sdk-route53domains (~> 1.0)
      aws-sdk-route53resolver (~> 1.0)
      aws-sdk-s3 (~> 1.30)
      aws-sdk-securityhub (~> 1.0)
      aws-sdk-ses (~> 1.0)
      aws-sdk-sms (~> 1.0)
      aws-sdk-sns (~> 1.9)
      aws-sdk-sqs (~> 1.10)
      aws-sdk-ssm (~> 1.0)
    train-core (3.3.27)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
      mixlib-shellout (>= 2.0, < 4.0)
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
    train-habitat (0.2.13)
    train-winrm (0.2.11)
      winrm (~> 2.0)
      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
    tty-box (0.6.0)
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-cursor (~> 0.7)
    tty-color (0.5.2)
    tty-cursor (0.7.1)
    tty-prompt (0.22.0)
      pastel (~> 0.8)
      tty-reader (~> 0.8)
    tty-reader (0.8.0)
      tty-cursor (~> 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)
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.7)
    unicode-display_width (1.7.0)
    unicode_utils (1.4.0)
    uri_template (0.7.0)
    winrm (2.3.5)
      builder (>= 2.1.2)
      erubi (~> 1.8)
      gssapi (~> 1.2)
      gyoku (~> 1.0)
      httpclient (~> 2.2, >= 2.2.0.2)
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
      rubyntlm (~> 0.6.0, >= 0.6.1)
    winrm-elevated (1.2.2)
      erubi (~> 1.8)
      winrm (~> 2.0)
      winrm-fs (~> 1.0)
    winrm-fs (1.3.3)
      erubi (~> 1.8)
      logging (>= 1.6.1, < 3.0)
      rubyzip (~> 1.1)
      winrm (~> 2.0)
    wisper (2.0.1)
 PLATFORMS
  ruby
 DEPENDENCIES
  inspec (~> 4.22.22)
  kitchen-docker!
  kitchen-inspec (>= 2.2.1)
  kitchen-salt (>= 0.6.3)
  kitchen-vagrant
 BUNDLED WITH
   2.1.2
--- 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/bin/kitchen
+++ b/bin/kitchen
@@ -8,22 +8,25 @@
 # this file is here to facilitate running it.
 #
-require "pathname"
+require 'pathname'
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 if File.file?(bundle_binstub)
  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
    load(bundle_binstub)
  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+    abort(
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+      '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
 end
-require "rubygems"
+require 'rubygems'
-require "bundler/setup"
+require 'bundler/setup'
-load Gem.bin_path("test-kitchen", "kitchen")
+load Gem.bin_path('test-kitchen', 'kitchen')
--- 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
@@ -13,35 +13,35 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - Avatar
     - Contributor
     - Contributions
   * - :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>`_
     - 58
   * - :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>`_
-     - 50
+     - 131
   * - :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>`_
     - 74
   * - :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>`_
-     - 48
+     - 54
   * - :raw-html-m2r:`<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
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>`
     - `@vutny <https://github.com/vutny>`_
     - 31
   * - :raw-html-m2r:`<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
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
     - `@nmadhok <https://github.com/nmadhok>`_
     - 19
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>`
     - `@vutny <https://github.com/vutny>`_
     - 18
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
     - `@puneetk <https://github.com/puneetk>`_
     - 11
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>`
     - `@EvaSDK <https://github.com/EvaSDK>`_
     - 9
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferramosi'>`
-     - `@dferrantelli <https://github.com/dferrantelli>`_
+     - `@dferramosi <https://github.com/dferramosi>`_
     - 8
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
     - `@johnkeates <https://github.com/johnkeates>`_
@@ -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'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyfeldroy'>`
-     - `@audreyr <https://github.com/audreyr>`_
+     - `@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
@@ -112,8 +115,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://avatars1.githubusercontent.com/u/1922124?v=4' width='36' height='36' alt='@bebosudo'>`
     - `@bebosudo <https://github.com/bebosudo>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@coffee-powered-coder'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@sarcastic-coder'>`
-     - `@coffee-powered-coder <https://github.com/coffee-powered-coder>`_
+     - `@sarcastic-coder <https://github.com/sarcastic-coder>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/458548?v=4' width='36' height='36' alt='@SuperTux88'>`
     - `@SuperTux88 <https://github.com/SuperTux88>`_
@@ -166,9 +169,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/2592431?v=4' width='36' height='36' alt='@RobRuana'>`
     - `@RobRuana <https://github.com/RobRuana>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/3165500?v=4' width='36' height='36' alt='@rmartins90'>`
     - `@rmartins90 <https://github.com/rmartins90>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10464711?v=4' width='36' height='36' alt='@sbrefort'>`
     - `@sbrefort <https://github.com/sbrefort>`_
     - 1
@@ -199,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
@@ -206,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 2019-07-24.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-01-07.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,269 @@
 Changelog
 =========
 `0.41.5 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.4...v0.41.5>`_ (2021-01-07)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **cent7:** postgres11 needs libicu installed (\ `4c0f796 <https://github.com/saltstack-formulas/postgres-formula/commit/4c0f796f00901b88e0ee9d778a5acb2115bf17cb>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `e84389d <https://github.com/saltstack-formulas/postgres-formula/commit/e84389dbb31f04f3eeabfd3935ef193e09e5b562>`_\ )
 * **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `2615411 <https://github.com/saltstack-formulas/postgres-formula/commit/2615411ec019600328c330cb4e72de89472f8fc9>`_\ )
 `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)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **contributing:** postgresql-repo state ID requires python3-apt package (\ `69b57e3 <https://github.com/saltstack-formulas/postgres-formula/commit/69b57e3b69062d0b66bd9fb28e3769a9ff579faa>`_\ )
 * **contributing:** postgresql-service-reload type (\ `278893c <https://github.com/saltstack-formulas/postgres-formula/commit/278893c2f0f3fa8db26b45b3874f7dd7177b714a>`_\ )
 * **contributing:** runnig formula inside container (\ `68a791e <https://github.com/saltstack-formulas/postgres-formula/commit/68a791ef091114b081f71631d94201a9f1ed07b6>`_\ )
 * **libtofs:** “files_switch” mess up the variable exported by “map.jinja” [skip ci] (\ `e6b1485 <https://github.com/saltstack-formulas/postgres-formula/commit/e6b14853d5ce2369ead22cabdfc48ae63f64e550>`_\ )
 * **postgres.server:** reverted how posrgre.server.image is included (\ `07044bf <https://github.com/saltstack-formulas/postgres-formula/commit/07044bf7c1d420855b43d6add30358ff39666702>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **gemfile:** remove unused ``rspec-retry`` gem [skip ci] (\ `85feac2 <https://github.com/saltstack-formulas/postgres-formula/commit/85feac2852ee399f37293b60008e3a17d19cd47f>`_\ )
 * **gemfile:** update for Vagrant testing [skip ci] (\ `061715e <https://github.com/saltstack-formulas/postgres-formula/commit/061715e560880a9a60720bbcbeda632c010d03a4>`_\ )
 * **gemfile.lock:** add to repo with updated ``Gemfile`` [skip ci] (\ `35850da <https://github.com/saltstack-formulas/postgres-formula/commit/35850da22cb4f61144a61098b9869603b6e0a682>`_\ )
 * **kitchen:** avoid using bootstrap for ``master`` instances [skip ci] (\ `86697d8 <https://github.com/saltstack-formulas/postgres-formula/commit/86697d8df48e24e37d6885f68ea8988d43b076aa>`_\ )
 * **kitchen:** use ``saltimages`` Docker Hub where available [skip ci] (\ `5e29999 <https://github.com/saltstack-formulas/postgres-formula/commit/5e29999495f36653aa1b51f2baf956533fdee7e4>`_\ )
 * **kitchen+travis:** remove ``master-py2-arch-base-latest`` [skip ci] (\ `c46053a <https://github.com/saltstack-formulas/postgres-formula/commit/c46053abd8019a4229daf19db1af86c5f8961353>`_\ )
 * **travis:** add notifications => zulip [skip ci] (\ `442cfec <https://github.com/saltstack-formulas/postgres-formula/commit/442cfec245fb6b22d7768c8436ba6c62ca2975fd>`_\ )
 * **workflows/commitlint:** add to repo [skip ci] (\ `0c766c8 <https://github.com/saltstack-formulas/postgres-formula/commit/0c766c8e2e336e31d44fdddf5f4c5e56faa9e40e>`_\ )
 Documentation
 ^^^^^^^^^^^^^
 * **container:** "postgres:bake_image" specifics (\ `904a525 <https://github.com/saltstack-formulas/postgres-formula/commit/904a5258cd155f3b5a83ec8dc8e990a8ffc6b798>`_\ )
 `0.41.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.5...v0.41.0>`_ (2019-12-27)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **mac_shortcut.sh:** fix ``shellcheck`` error (\ `d538798 <https://github.com/saltstack-formulas/postgres-formula/commit/d538798ee4423ecb72b29bd39e4f35437412ce43>`_\ )
 * **release.config.js:** use full commit hash in commit link [skip ci] (\ `f3ec66d <https://github.com/saltstack-formulas/postgres-formula/commit/f3ec66d5ed90bc9a458fdff2233c9a707f0c9c72>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **gemfile:** restrict ``train`` gem version until upstream fix [skip ci] (\ `a77bb06 <https://github.com/saltstack-formulas/postgres-formula/commit/a77bb06b18823c7db0debd2c4ff135a367f76d04>`_\ )
 * **kitchen:** use ``develop`` image until ``master`` is ready (\ ``amazonlinux``\ ) [skip ci] (\ `20e5e46 <https://github.com/saltstack-formulas/postgres-formula/commit/20e5e46e1011641714a11756617530b898e3d689>`_\ )
 * **kitchen+travis:** upgrade matrix after ``2019.2.2`` release [skip ci] (\ `8080be6 <https://github.com/saltstack-formulas/postgres-formula/commit/8080be6be3dd0c8799fa102b1235fb151514bced>`_\ )
 * **travis:** apply changes from build config validation [skip ci] (\ `8ce1ee4 <https://github.com/saltstack-formulas/postgres-formula/commit/8ce1ee4ecc5dd6a6a14118eda75b3446b6f58d82>`_\ )
 * **travis:** opt-in to ``dpl v2`` to complete build config validation [skip ci] (\ `bd5959c <https://github.com/saltstack-formulas/postgres-formula/commit/bd5959c60a93e65ea0658f5cb7fd1609bdd3399c>`_\ )
 * **travis:** quote pathspecs used with ``git ls-files`` [skip ci] (\ `0a2b63a <https://github.com/saltstack-formulas/postgres-formula/commit/0a2b63aba85b09c8983d066cbad7e344de791db1>`_\ )
 * **travis:** run ``shellcheck`` during lint job [skip ci] (\ `f0d12ca <https://github.com/saltstack-formulas/postgres-formula/commit/f0d12caac67bf7f2049ca7f1b7185912e876cb02>`_\ )
 * **travis:** use ``major.minor`` for ``semantic-release`` version [skip ci] (\ `1392538 <https://github.com/saltstack-formulas/postgres-formula/commit/1392538665bea2a699836a87a6b749e07276a94d>`_\ )
 * **travis:** use build config validation (beta) [skip ci] (\ `c9a57aa <https://github.com/saltstack-formulas/postgres-formula/commit/c9a57aa96bb80dc27c4722e0f8dc45c77460c03a>`_\ )
 Features
 ^^^^^^^^
 * **codenamemap:** update for current versions (\ `9cc95c0 <https://github.com/saltstack-formulas/postgres-formula/commit/9cc95c020909563486f404b186e15ed71dd8a83a>`_\ )
 Performance Improvements
 ^^^^^^^^^^^^^^^^^^^^^^^^
 * **travis:** improve ``salt-lint`` invocation [skip ci] (\ `ccaf4e5 <https://github.com/saltstack-formulas/postgres-formula/commit/ccaf4e5e3729c75c3a5eccbf482e7fca09415fea>`_\ )
 `0.40.5 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.4...v0.40.5>`_ (2019-10-28)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **macros.jinja:** apply suggestion from PR (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/d606b28>`_\ )
 * **macros.jinja:** use ``user`` kwarg for schemas (required on FreeBSD) (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/7ff798a>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **kitchen:** add pre-salted ``FreeBSD-12.0`` box for local testing (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/eefb89e>`_\ )
 * **kitchen:** use ``debian-10-master-py3`` instead of ``develop`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/81b2c2e>`_\ )
 * **travis:** update ``salt-lint`` config for ``v0.0.10`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/62baac2>`_\ )
 Documentation
 ^^^^^^^^^^^^^
 * **contributing:** remove to use org-level file instead [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/5a291ab>`_\ )
 * **readme:** update link to ``CONTRIBUTING`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/e568f28>`_\ )
 `0.40.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.3...v0.40.4>`_ (2019-10-11)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/37b0c43>`_\ )
 * **rubocop:** fix remaining errors manually (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/b369aa9>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/7822200>`_\ )
 * **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/2c82872>`_\ )
 `0.40.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.2...v0.40.3>`_ (2019-10-10)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **manage.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/bf5b4d6>`_\ )
 * **python.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/1f3cfcc>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/7ca61f3>`_\ )
 * **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/76e3e39>`_\ )
 * **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/3a27978>`_\ )
 * **platform:** add ``arch-base-latest`` (commented out for now) [skip ci] (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/89e4a34>`_\ )
 * merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/postgres-formula/commit/a0fdd48>`_\ )
 `0.40.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2>`_ (2019-09-13)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **freebsd:** no libpqdev freebsd package (\ `eca6d97 <https://github.com/saltstack-formulas/postgres-formula/commit/eca6d97>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ `9796319 <https://github.com/saltstack-formulas/postgres-formula/commit/9796319>`_\ )
 `0.40.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.0...v0.40.1>`_ (2019-09-11)
 -------------------------------------------------------------------------------------------------------------
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ `fc6cbe0 <https://github.com/saltstack-formulas/postgres-formula/commit/fc6cbe0>`_\ )
 Documentation
 ^^^^^^^^^^^^^
 * **pillar.example:** update examples for freebsd (\ `a799214 <https://github.com/saltstack-formulas/postgres-formula/commit/a799214>`_\ )
 `0.40.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.1...v0.40.0>`_ (2019-09-03)
 -------------------------------------------------------------------------------------------------------------
 Features
 ^^^^^^^^
 * **archlinux:** add support, fixing rendering errors (\ `e970925 <https://github.com/saltstack-formulas/postgres-formula/commit/e970925>`_\ )
 `0.39.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.0...v0.39.1>`_ (2019-09-01)
 -------------------------------------------------------------------------------------------------------------
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **kitchen+travis:** replace EOL pre-salted images (\ `140928b <https://github.com/saltstack-formulas/postgres-formula/commit/140928b>`_\ )
 Tests
 ^^^^^
 * **inspec:** fix reference to ``suse`` after gem ``train`` update (\ `677adba <https://github.com/saltstack-formulas/postgres-formula/commit/677adba>`_\ )
 `0.39.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.38.0...v0.39.0>`_ (2019-08-17)
 -------------------------------------------------------------------------------------------------------------
 Features
 ^^^^^^^^
 * **yamllint:** include for this repo and apply rules throughout (\ `1f0fd92 <https://github.com/saltstack-formulas/postgres-formula/commit/1f0fd92>`_\ )
 `0.38.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.4...v0.38.0>`_ (2019-07-24)
 -------------------------------------------------------------------------------------------------------------
--- a/docs/CONTRIBUTING.rst
+++ b/docs/CONTRIBUTING.rst
@@ -1,159 +0,0 @@
 .. _contributing:
 How to contribute
 =================
 This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one.
 What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo.
 It also covers how to contribute to this *formula's documentation*.
 .. contents:: **Table of Contents**
 Overview
 --------
 Submitting a pull request is more than just code!
 To achieve a quality product, the *tests* and *documentation* need to be updated as well.
 An excellent pull request will include these in the changes, wherever relevant.
 Commit message formatting
 -------------------------
 Since every type of change requires making Git commits,
 we will start by covering the importance of ensuring that all of your commit
 messages are in the correct format.
 Automation of multiple processes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 This formula uses `semantic-release <https://github.com/semantic-release/semantic-release>`_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog.
 The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation.
 Full details are available in the upstream docs regarding the `Angular Commit Message Conventions <https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines>`_.
 The key factor is that the first line of the commit message must follow this format:
 .. code-block::
   type(scope): subject
 * E.g. ``docs(contributing): add commit message formatting instructions``.
 Besides the version bump, the changelog and release notes are formatted accordingly.
 So based on the example above:
 ..
   .. raw:: html
      <h3>Documentation</h3>
   * **contributing:** add commit message formatting instructions
 * The ``type`` translates into a ``Documentation`` sub-heading.
 * The ``(scope):`` will be shown in bold text without the brackets.
 * The ``subject`` follows the ``scope`` as standard text.
 Linting commit messages in Travis CI
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 This formula uses `commitlint <https://github.com/conventional-changelog/commitlint>`_ for checking commit messages during CI testing.
 This ensures that they are in accordance with the ``semantic-release`` settings.
 For more details about the default settings, refer back to the ``commitlint`` `reference rules <https://conventional-changelog.github.io/commitlint/#/reference-rules>`_.
 Relationship between commit type and version bump
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 This formula applies some customisations to the defaults, as outlined in the table below,
 based upon the `type <https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type>`_ of the commit:
 .. list-table::
   :name: commit-type-vs-version-bump
   :header-rows: 1
   :stub-columns: 0
   :widths: 1,2,3,1,1
   * - Type
     - Heading
     - Description
     - Bump (default)
     - Bump (custom)
   * - ``build``
     - Build System
     - Changes related to the build system
     - –
     -
   * - ``chore``
     - –
     - Changes to the build process or auxiliary tools and libraries such as
       documentation generation
     - –
     -
   * - ``ci``
     - Continuous Integration
     - Changes to the continuous integration configuration
     - –
     -
   * - ``docs``
     - Documentation
     - Documentation only changes
     - –
     - 0.0.1
   * - ``feat``
     - Features
     - A new feature
     - 0.1.0
     -
   * - ``fix``
     - Bug Fixes
     - A bug fix
     - 0.0.1
     -
   * - ``perf``
     - Performance Improvements
     - A code change that improves performance
     - 0.0.1
     -
   * - ``refactor``
     - Code Refactoring
     - A code change that neither fixes a bug nor adds a feature
     - –
     - 0.0.1
   * - ``revert``
     - Reverts
     - A commit used to revert a previous commit
     - –
     - 0.0.1
   * - ``style``
     - Styles
     - Changes that do not affect the meaning of the code (white-space,
       formatting, missing semi-colons, etc.)
     - –
     - 0.0.1
   * - ``test``
     - Tests
     - Adding missing or correcting existing tests
     - –
     - 0.0.1
 Use ``BREAKING CHANGE`` to trigger a ``major`` version change
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used.
 This will be appended to the changelog and release notes as well.
 To preserve good formatting of these notes, the following format is prescribed:
 * ``BREAKING CHANGE: <explanation in paragraph format>.``
 An example of that:
 .. code-block:: git
   ...
   BREAKING CHANGE: With the removal of all of the `.sls` files under
   `template package`, this formula no longer supports the installation of
   packages.
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -37,7 +37,7 @@ Contributing to this repo
 **Commit message formatting is significant!!**
-Please see :ref:`How to contribute <CONTRIBUTING>` for more details.
+Please see `How to contribute <https://github.com/saltstack-formulas/.github/blob/master/CONTRIBUTING.rst>`_ for more details.
 Available states
 ----------------
@@ -83,31 +83,15 @@ packaged init script, job or unit.
    Further information: https://blog.tyk.nu/blog/freebsd-jails-and-sysv-ipc/
-``postgres.server.image``
+**Running inside a container** (using Packer, Docker or similar tools), when OS ``init`` process
-^^^^^^^^^^^^^^^^^^^^^^^^^
+is not available to start the service and enable it on "boot", set pillar value:
 Installs the PostgreSQL server package on Linux, prepares the DB cluster and starts the server by issuing
 raw ``pg_ctl`` command. The ``postgres:bake_image`` Pillar toggles this behaviour. For example:
 .. code:: yaml
  postgres:
    bake_image: True
-If set ``True``, then it becomes possible to fully provision PostgreSQL with all supported entities
+This toggles starting PostgreSQL daemon by issuing raw ``pg_ctl`` or ``pg_ctlcluster`` command.
 from ``postgres.manage`` state during the build ("baking") of AMI / VM / Container images (using
 Packer, Docker or similar tools), i.e. when OS ``init`` process is not available to start the
 service and enable it on "boot" of resulting appliance.
 Also it allows to make Docker images with PostgreSQL using functionality being available since Salt
 2016.11.0 release:
 .. code:: console
  salt 'minion.with.docker' dockerng.sls_build my-postgres base=centos/systemd mods=postgres
 If a lookup dictionary or Pillar has ``postgres:bake_image`` set ``False`` (this is default), it is
 equivalent of applying ``postgres.server`` state.
 ``postgres.upstream``
 ^^^^^^^^^^^^^^^^^^^^^
--- a/docs/TOFS_pattern.rst
+++ b/docs/TOFS_pattern.rst
@@ -39,7 +39,7 @@ Using SaltStack is a simple and effective way to implement configuration managem
 To avoid this situation we can use the `pillar mechanism <http://docs.saltstack.com/en/latest/topics/pillar/>`_, which is designed to provide controlled access to data from the minions based on some selection rules. As pillar data could be easily integrated in the `Jinja <http://docs.saltstack.com/en/latest/topics/tutorials/pillar.html>`_ templates, it is a good mechanism to store values to be used in the final rendering of state files and templates.
-There are a variety of approaches on the usage of pillar and templates as seen in the `saltstack-formulas <https://github.com/saltstack-formulas>`_' repositories. `Some <https://github.com/saltstack-formulas/nginx-formula/pull/18>`_ `developments <https://github.com/saltstack-formulas/php-formula/pull/14>`_ stress the initial purpose of pillar data into a storage for most of the possible variables for a determined system configuration. This, in my opinion, is shifting too much load from the original template files approach. Adding up some `non-trivial Jinja <https://github.com/spsoit/nginx-formula/blob/81de880fe0276dd9488ffa15bc78944c0fc2b919/nginx/ng/files/nginx.conf>`_ code as essential part of composing the state file definitely makes SaltStack state files (hence formulas) more difficult to read. The extreme of this approach is that we could end up with a new render mechanism, implemented in Jinja, storing everything needed in pillar data to compose configurations. Additionally, we are establishing a strong dependency with the Jinja renderer.
+There are a variety of approaches on the usage of pillar and templates as seen in the `saltstack-formulas <https://github.com/saltstack-formulas>`_' repositories. `Some <https://github.com/saltstack-formulas/nginx-formula/pull/18>`_ `developments <https://github.com/saltstack-formulas/php-formula/pull/14>`_ stress the initial purpose of pillar data into a storage for most of the possible variables for a determined system configuration. This, in my opinion, is shifting too much load from the original template files approach. Adding up some `non-trivial Jinja <https://github.com/saltstack-formulas/nginx-formula/blob/f74254c07e188bd448eaf1c5f9c802d78c4c005e/nginx/files/default/nginx.conf>`_ code as essential part of composing the state file definitely makes SaltStack state files (hence formulas) more difficult to read. The extreme of this approach is that we could end up with a new render mechanism, implemented in Jinja, storing everything needed in pillar data to compose configurations. Additionally, we are establishing a strong dependency with the Jinja renderer.
 In opposition to the *put the code in file_roots and the data in pillars* approach, there is the *pillar as a store for a set of key-values* approach. A full-blown configuration file abstracted in pillar and jinja is complicated to develop, understand and maintain. I think a better and simpler approach is to keep a configuration file templated using just a basic (non-extensive but extensible) set of pillar values.
@@ -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/
@@ -325,6 +325,7 @@ We can simplify the ``conf.sls`` with the new ``files_switch`` macro to use in t
 * This uses ``config.get``, searching for ``ntp:tofs:source_files:Configure NTP`` to determine the list of template files to use.
 * If this returns a result, the default of ``['/etc/ntp.conf.jinja']`` will be appended to it.
 * If this does not yield any results, the default of ``['/etc/ntp.conf.jinja']`` will be used.
 In ``libtofs.jinja``, we define this new macro ``files_switch``.
@@ -426,7 +427,6 @@ The list of ``source_files`` can be given:
     tofs:
       source_files:
         Configure NTP:
           - '/etc/ntp.conf.jinja'
           - '/etc/ntp.conf_alt.jinja'
 Resulting in:
@@ -434,10 +434,85 @@ Resulting in:
 .. code-block:: sls
         - source:
           - salt://ntp/files/theminion/etc/ntp.conf.jinja
           - salt://ntp/files/theminion/etc/ntp.conf_alt.jinja
-           - salt://ntp/files/Debian/etc/ntp.conf.jinja
+           - salt://ntp/files/theminion/etc/ntp.conf.jinja
           - salt://ntp/files/Debian/etc/ntp.conf_alt.jinja
-           - salt://ntp/files/default/etc/ntp.conf.jinja
+           - salt://ntp/files/Debian/etc/ntp.conf.jinja
           - salt://ntp/files/default/etc/ntp.conf_alt.jinja
           - salt://ntp/files/default/etc/ntp.conf.jinja
 Note: This does *not* override the default value.
 Rather, the value from the pillar/config is prepended to the default.
 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:: console
   /srv/saltstack/systemd-formula/
     systemd/
       init.sls
       libtofs.jinja
       map.jinja
       networkd/
         init.sls
         files/
           default/
             network/
               99-default.link
       resolved/
         init.sls
         files/
           default/
             resolved.conf
       timesyncd/
         init.sls
         files/
           Arch/
             resolved.conf
           Debian/
             resolved.conf
           default/
             resolved.conf
           Ubuntu/
             resolved.conf
 For example, the following ``formula.component.config`` SLS:
 .. code-block:: sls
   {%- from "formula/libtofs.jinja" import files_switch with context %}
   formula configuration file:
     file.managed:
       - name: /etc/formula.conf
       - user: root
       - group: root
       - mode: 644
       - template: jinja
       - source: {{ files_switch(['formula.conf'],
                                 lookup='formula',
                                 use_subpath=True
                    )
                 }}
 will be rendered on a ``Debian`` minion named ``salt-formula.ci.local`` as:
 .. code-block:: sls
   formula configuration file:
     file.managed:
       - name: /etc/formula.conf
       - user: root
       - group: root
       - mode: 644
       - template: jinja
       - source:
         - salt://formula/component/files/salt-formula.ci.local/formula.conf
         - salt://formula/component/files/Debian/formula.conf
         - salt://formula/component/files/default/formula.conf
         - salt://formula/files/salt-formula.ci.local/formula.conf
         - salt://formula/files/Debian/formula.conf
         - salt://formula/files/default/formula.conf
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -0,0 +1,17 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 driver:
  name: vagrant
 platforms:
  - name: freebsd-120-2019-2-py3
    driver:
      box_url: https://freebsd.z.vstack.com/FreeBSD-12.0.box
      cache_directory: false
      customize:
        usbxhci: 'off'
      gui: false
      linked_clone: true
      ssh:
        shell: '/bin/sh'
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -11,97 +11,127 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
-  ## SALT `develop`
+  ## SALT `master`
-  - name: debian-9-develop-py3
+  - name: debian-10-master-py3
    driver:
-      image: netmanagers/salt-develop-py3:debian-9
+      image: saltimages/salt-master-py3:debian-10
-      provision_command:
+  - name: ubuntu-2004-master-py3
        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
  - name: ubuntu-1804-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:ubuntu-18.04
+      image: saltimages/salt-master-py3:ubuntu-20.04
-      provision_command:
+  - name: ubuntu-1804-master-py3
        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
  - name: centos-7-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:centos-7
+      image: saltimages/salt-master-py3:ubuntu-18.04
-      provision_command:
+  - name: centos-8-master-py3
        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
  - name: fedora-29-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:fedora-29
+      image: saltimages/salt-master-py3:centos-8
-      provision_command:
+  - name: fedora-32-master-py3
        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
  - name: opensuse-leap-15-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:opensuse-leap-15
+      image: saltimages/salt-master-py3:fedora-32
-      provision_command:
+  - name: fedora-31-master-py3
-        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+    driver:
-        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+      image: saltimages/salt-master-py3:fedora-31
  - name: opensuse-leap-152-master-py3
    driver:
      image: saltimages/salt-master-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-master-py3
    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:
      image: saltimages/salt-2019.2-py3:debian-10
  - name: debian-9-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:debian-9
+      image: saltimages/salt-2019.2-py3:debian-9
  - name: ubuntu-1804-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:ubuntu-18.04
+      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: netmanagers/salt-2019.2-py3:centos-7
+      image: saltimages/salt-2019.2-py3:centos-7
-  - name: fedora-29-2019-2-py3
+  - name: fedora-31-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:fedora-29
+      image: saltimages/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-15-2019-2-py3
+  - name: opensuse-leap-152-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15
+      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.2`:
-  ## SALT `2018.3`
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-  - name: debian-9-2018-3-py2
+    transport:
      max_ssh_sessions: 1
  - name: amazonlinux-2-2019-2-py3
    driver:
-      image: netmanagers/salt-2018.3-py2:debian-9
+      image: saltimages/salt-2019.2-py3:amazonlinux-2
-  - name: ubuntu-1604-2018-3-py2
+  - name: centos-6-2019-2-py2
    driver:
-      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
+      image: saltimages/salt-2019.2-py2:centos-6
  - name: centos-7-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:centos-7
  - name: fedora-29-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:fedora-29
  - name: opensuse-leap-42-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:opensuse-leap-42
      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-28-2017-7-py2
+  - name: amazonlinux-1-2019-2-py2
    driver:
-      image: netmanagers/salt-2017.7-py2:fedora-28
+      image: saltimages/salt-2019.2-py2:amazonlinux-1
-  - name: opensuse-leap-42-2017-7-py2
+      run_command: /sbin/init
  - name: arch-base-latest-2019-2-py2
    driver:
-      image: netmanagers/salt-2017.7-py2:opensuse-leap-42
+      image: saltimages/salt-2019.2-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd
 provisioner:
  name: salt_solo
-  log_level: info
+  log_level: debug
  salt_install: none
  require_chef: false
  formula: postgres
--- a/pillar.example
+++ b/pillar.example
@@ -1,24 +1,27 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 # Port to use for the cluster -- can be used to provide a non-standard port
 # NOTE: If already set in the minion config, that value takes priority
 postgres.port: '5432'
 postgres:
  # UPSTREAM REPO
-  # Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
+  # Set true to configure upstream postgresql.org repository for YUM/APT/ZYPP
-  use_upstream_repo: False
+  use_upstream_repo: false
-  # Version to install from upstream repository (if upstream_repo: True)
+  # Version to install from upstream repository (if upstream_repo: true)
  version: '10'
-  # Set True to add a file in /etc/profile.d adding the bin dir in $PATH
+  # Set true to add a file in /etc/profile.d adding the bin dir in $PATH
  # as packages from upstream put them somewhere like /usr/pgsql-10/bin
-  add_profile: False
+  add_profile: false
  # If automatic package installation fails, use `fromrepo` to specify the
-  # upstream repo to install packages from [#133, #185] (if upstream_repo: True)
+  # upstream repo to install packages from [#133, #185] (if upstream_repo: true)
  fromrepo: 'jessie-pgdg'
  ### MACOS
  # Set to 'postgresapp' OR 'homebrew' for MacOS
-  #use_upstream_repo: 'postgresapp'
+  # use_upstream_repo: 'postgresapp'
-  #use_upstream_repo: 'homebrew'
+  # use_upstream_repo: 'homebrew'
  # PACKAGE
  # These pillars are typically never required.
@@ -27,9 +30,11 @@ postgres:
  # service:
  #   name: 'postgresql'
  #   flags: -w -s -m fast
-  #   sysrc: True
+  #   sysrc: true
  pkgs_extra:
       {%- if grains.os_family not in ('FreeBSD',) %}
    - postgresql-contrib
       {%- endif %}
    - postgresql-plpython
  # CLUSTER
@@ -39,7 +44,7 @@ postgres:
    locale: en_US.UTF-8
    # encoding: UTF8
-  #'Alternatives system' priority incremental. 0 disables feature.
+  # 'Alternatives system' priority incremental. 0 disables feature.
  linux:
    altpriority: 30
@@ -62,7 +67,7 @@ postgres:
  # are authenticated, which PostgreSQL user names they can use, which
  # databases they can access. Records take one of these forms:
  #
-  #acls:
+  # acls:
  #  - ['local', 'DATABASE',  'USER',  'METHOD']
  #  - ['host', 'DATABASE',  'USER',  'ADDRESS', 'METHOD']
  #  - ['hostssl', 'DATABASE', 'USER', 'ADDRESS', 'METHOD']
@@ -83,19 +88,19 @@ postgres:
    - ['users_as_appuser', 'jsmith', 'connuser']
  # Backup extension for configuration files, defaults to ``.bak``.
-  # Set ``False`` to stop creation of backups when config files change.
+  # Set ``false`` to stop creation of backups when config files change.
  {%- if salt['status.time']|default(none) is callable %}
  config_backup: ".backup@{{ salt['status.time']('%y-%m-%d_%H:%M:%S') }}"
  {%- endif %}
-  {%- if grains['init'] == 'unknown' %}
+  {%- if 'init' in grains and grains['init'] == 'unknown' %}
  # If Salt is unable to detect init system running in the scope of state run,
  # probably we are trying to bake a container/VM image with PostgreSQL.
  # Use ``bake_image`` setting to control how PostgreSQL will be started: if set
-  # to ``True`` the raw ``pg_ctl`` will be utilized instead of packaged init
+  # to ``true`` the raw ``pg_ctl`` will be utilized instead of packaged init
  # script, job or unit run with Salt ``service`` state.
-  bake_image: True
+  bake_image: true
  {%- endif %}
@@ -106,7 +111,7 @@ postgres:
  #
  # Format is the following:
  #
-  #<users|tablespaces|databases|schemas|extensions>:
+  # <users|tablespaces|databases|schemas|extensions>:
  #  NAME:
  #    ensure: <present|absent>  # 'present' is the default
  #    ARGUMENT: VALUE
@@ -117,13 +122,13 @@ postgres:
  #
  # For example, the Pillar:
  #
-  #users:
+  # users:
  #  testUser:
  #    password: test
  #
  # will render such state:
  #
-  #postgres_user-testUser:
+  # postgres_user-testUser:
  #  postgres_user.present:
  #    - name: testUser
  #    - password: test
@@ -131,18 +136,18 @@ postgres:
    localUser:
      ensure: present
      password: '98ruj923h4rf'
-      createdb: False
+      createdb: false
-      createroles: False
+      createroles: false
-      inherit: True
+      inherit: true
-      replication: False
+      replication: false
    remoteUser:
      ensure: present
      password: '98ruj923h4rf'
-      createdb: False
+      createdb: false
-      createroles: False
+      createroles: false
-      inherit: True
+      inherit: true
-      replication: False
+      replication: false
    absentUser:
      ensure: absent
@@ -183,14 +188,14 @@ postgres:
  # optional extensions to install in schema
  extensions:
    # postgis: {}
    uuid-ossp:
      schema: uuid-ossp
      maintenance_db: db1
    #postgis: {}
  remove:
-    data: True
+    data: true
-    multiple_releases: True
+    multiple_releases: true
-    releases: ['9.6', '10',]
+    releases: ['9.6', '10']
 # vim: ft=yaml ts=2 sts=2 sw=2 et
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -1,3 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 ### Set parameters based on PostgreSQL version supplied with particular distro
 {% import_yaml "postgres/repo.yaml" as repo %}
@@ -32,6 +35,7 @@
  prepare_cluster:
    pgcommand: pg_createcluster {{ version }} {{ cluster_name }} -d
    user: root
  bake_image_run_cmd: pg_ctlcluster {{ version }} {{ cluster_name }} start
 {% endmacro %}
@@ -51,28 +55,31 @@
 {% endmacro %}
 ## Debian GNU/Linux (the second parameter refers to the postgresql package version, not the distro)
-{{ debian_codename('wheezy', '9.1') }}
+# http://apt.postgresql.org/pub/repos/apt/dists/
 # https://packages.debian.org/search?keywords=postgresql&searchon=names
 {{ debian_codename('jessie', '9.4') }}
 {{ debian_codename('stretch', '9.6') }}
 {{ debian_codename('buster', '11') }}
 # `oscodename` grain has long distro name
 # if `lsb-release` package not installed
 {{ debian_codename('wheezy', '9.1', 'Debian GNU/Linux 7 (wheezy)') }}
 {{ debian_codename('jessie', '9.4', 'Debian GNU/Linux 8 (jessie)') }}
 {{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
 {{ debian_codename('buster', '11', 'Debian GNU/Linux 10 (buster)') }}
 ## Ubuntu
-{{ debian_codename('trusty', '9.3') }}
+# http://apt.postgresql.org/pub/repos/apt/dists/
 # https://packages.ubuntu.com/search?keywords=postgresql&searchon=names
 {{ debian_codename('xenial', '9.5') }}
 {{ debian_codename('artful', '9.6') }}
 {{ debian_codename('bionic', '10') }}
-{{ debian_codename('cosmic', '10') }}
+{{ debian_codename('eoan', '11') }}
 {{ debian_codename('focal', '12') }}
 ## Fedora
 # http://apt.postgresql.org/pub/repos/yum/reporpms/
 # https://apps.fedoraproject.org/packages/postgresql
 # `oscodename` grain has long distro name
-{{ fedora_codename('Fedora-27', '9.6', 'Fedora 27 (Twenty Seven)') }}
+{{ fedora_codename('Fedora-31', '11', 'Fedora 31 (Thirty One)') }}
-{{ fedora_codename('Fedora-26', '9.6', 'Fedora 26 (Twenty Six)') }}
+{{ fedora_codename('Fedora-30', '11', 'Fedora 30 (Thirty)') }}
 # vim: ft=sls
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 # Default lookup dictionary
 postgres:
-  use_upstream_repo: True
+  use_upstream_repo: true
-  add_profile: False # add bin_dir to $PATH, if installed from repos
+  add_profile: false  # add bin_dir to $PATH, if installed from repos
-  version: '10'
+  version: '11'
  pkg: postgresql
  pkgs_extra: []
  pkgs_deps: []
  pkg_client: postgresql-client
  pkg_dev: postgresql-devel
  pkg_dev_deps: []
@@ -17,7 +21,7 @@ postgres:
  group: postgres
  prepare_cluster:
-    run: True
+    run: true
    pgcommand: initdb -D
    pgtestfile: PG_VERSION
    user: postgres
@@ -37,7 +41,8 @@ postgres:
    archive: postgres.dmg
    tmpdir: /tmp/postgrestmp
    postgresapp:
-      #See: https://github.com/PostgresApp/PostgresApp/releases/
+      # See: https://github.com/PostgresApp/PostgresApp/releases/
      # yamllint disable-line rule:line-length
      url: https://github.com/PostgresApp/PostgresApp/releases/download/v2.1.1/Postgres-2.1.1.dmg
      sum: sha256=ac0656b522a58fd337931313f09509c09610c4a6078fe0b8e469e69af1e1750b
    homebrew:
@@ -68,10 +73,11 @@ postgres:
  config_backup: '.bak'
  service:
-    name:  postgresql
+    name: postgresql
-    sysrc: False
+    sysrc: false
-  bake_image: False
+  bake_image: false
  bake_image_run_cmd: pg_ctl start
  fromrepo: ''
@@ -82,10 +88,10 @@ postgres:
  extensions: {}
  linux:
-    #Alternatives system are disabled by a 'altpriority=0' pillar.
+    # Alternatives system are disabled by a 'altpriority=0' pillar.
    altpriority: 0
  remove:
-    data: False
+    data: false
-    multiple_releases: False
+    multiple_releases: false
-    releases: ['9.2', '9.3', '9.4', '9.5', '9.6', '10',]
+    releases: ['9.2', '9.3', '9.4', '9.5', '9.6', '10']
--- a/postgres/libtofs.jinja
+++ b/postgres/libtofs.jinja
@@ -1,40 +1,37 @@
-{%- macro files_switch(source_files,
+{%- macro files_switch(
-                       lookup=None,
+      source_files,
-                       default_files_switch=['id', 'os_family'],
+      lookup=None,
-                       indent_width=6,
+      default_files_switch=["id", "os_family"],
-                       v1_path_prefix='') %}
+      indent_width=6,
-  {#-
+      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 override
+      * 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_witdh: indentation of the result value to conform to YAML
+      * indent_width: indentation of the result value to conform to YAML
-      * v1_path_prefix: (deprecated) only used for injecting a path prefix into
+      * use_subpath: defaults to `False` but if set, lookup the source file
-        the source, to support older TOFS configs
+        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'],
+          - source: {{ files_switch(
-                                    lookup='Deploy configuration'
+                         ["/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,56 +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` #}
+{#-   Get the `tplroot` from `tpldir` #}
-  {%- set tplroot = tpldir.split('/')[0] %}
+{%-   set tplroot = tpldir.split("/")[0] %}
-  {%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %}
+{%-   set path_prefix = salt["config.get"](tplroot ~ ":tofs:path_prefix", tplroot) %}
-  {%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %}
+{%-   set files_dir = salt["config.get"](tplroot ~ ":tofs:dirs:files", "files") %}
-  {%- set files_switch_list = salt['config.get'](
+{%-   set files_switch_list = salt["config.get"](
-      tplroot ~ ':tofs:files_switch',
+        tplroot ~ ":tofs:files_switch", default_files_switch
-      default_files_switch
+      ) %}
-  ) %}
+{#-   Lookup source_files (v2), files (v1), or fallback to an empty list #}
-  {#- Lookup source_files (v2), files (v1), or fallback to source_files parameter #}
+{%-   set src_files = salt["config.get"](
-  {%- set src_files = salt['config.get'](
+        tplroot ~ ":tofs:source_files:" ~ lookup,
-      tplroot ~ ':tofs:source_files:' ~ lookup,
+        salt["config.get"](tplroot ~ ":tofs:files:" ~ lookup, []),
-      salt['config.get'](
+      ) %}
-          tplroot ~ ':tofs:files:' ~ lookup,
+{#-   Append the default source_files #}
-          source_files
+{%-   set src_files = src_files + source_files %}
-      )
+{#-   Only add to [""] when supporting older TOFS implementations #}
-  ) %}
+{%-   set path_prefix_exts = [""] %}
-  {#- Only add to [''] when supporting older TOFS implementations #}
+{%-   if use_subpath and tplroot != tpldir %}
-  {%- set path_prefix_exts = [''] %}
+{#-     Walk directory tree to find {{ files_dir }} #}
-  {%- if v1_path_prefix != '' %}
+{%-     set subpath_parts = tpldir.lstrip(tplroot).lstrip("/").split("/") %}
-    {%- do path_prefix_exts.append(v1_path_prefix) %}
+{%-     for path in subpath_parts %}
-  {%- endif %}
+{%-       set subpath = subpath_parts[0 : loop.index] | join("/") %}
-  {%- for path_prefix_ext in path_prefix_exts %}
+{%-       do path_prefix_exts.append("/" ~ subpath) %}
-    {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
+{%-     endfor %}
-    {#- For older TOFS implementation, use `files_switch` from the config #}
+{%-   endif %}
-    {#- Use the default, new method otherwise #}
+{%-   for path_prefix_ext in path_prefix_exts | reverse %}
-    {%- set fsl = salt['config.get'](
+{%-     set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
-        tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch',
+{#-     For older TOFS implementation, use `files_switch` from the config #}
-        files_switch_list
+{#-     Use the default, new method otherwise #}
-    ) %}
+{%-     set fsl = salt["config.get"](
-    {#- Append an empty value to evaluate as `default` in the loop below #}
+          tplroot ~ path_prefix_ext | replace("/", ":") ~ ":files_switch",
-    {%- if '' not in fsl %}
+          files_switch_list,
-      {%- do fsl.append('') %}
+        ) %}
-    {%- endif %}
+{#-     Append an empty value to evaluate as `default` in the loop below #}
-    {%- for fs in fsl %}
+{%-     if "" not in fsl %}
-      {%- for src_file in src_files %}
+{%-       set fsl = fsl + [""] %}
-        {%- if fs %}
+{%-     endif %}
-          {%- set fs_dir = salt['config.get'](fs, fs) %}
+{%-     for fs in fsl %}
-        {%- else %}
+{%-       for src_file in src_files %}
-          {%- set fs_dir = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
+{%-         if fs %}
-        {%- endif %}
+{%-           set fs_dirs = salt["config.get"](fs, fs) %}
-        {%- set url = [
+{%-         else %}
-            '- salt:/',
+{%-           set fs_dirs = salt["config.get"](
-            path_prefix_inc_ext.strip('/'),
+                tplroot ~ ":tofs:dirs:default", "default"
-            files_dir.strip('/'),
+              ) %}
-            fs_dir.strip('/'),
+{%-         endif %}
-            src_file.strip('/'),
+{#-         Force the `config.get` lookup result as a list where necessary #}
-        ] | select | join('/') %}
+{#-         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("/")
              ) %}
 {{ url | indent(indent_width, true) }}
-      {%- 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 %}
@@ -18,7 +18,8 @@
  {%- if 'ensure' in kwarg %}
    {%- set ensure = kwarg.pop('ensure') %}
  {%- endif %}
-  {%- if 'user' not in kwarg and state != 'postgres_schema' %}
+  {%- set user_available = not (state == 'postgres_schema' and grains.saltversioninfo < [2018, 3]) %}
  {%- if 'user' not in kwarg and user_available %}
    {%- do kwarg.update({'user': postgres.user}) %}
  {%- endif -%}
--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -1,14 +1,19 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 {% import_yaml "postgres/repo.yaml" as repo %}
 {% 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
  pkg_dev: postgresql
 Debian:
  pkgs_deps: ['python3-apt']
  pkg_repo:
    humanname: PostgreSQL Official Repository
    key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
@@ -32,6 +37,7 @@ FreeBSD:
  conf_dir: /usr/local/pgsql/data
  data_dir: /usr/local/pgsql/data
    {% endif %}
  pkg_libpq_dev: null  #not in freebsd
  pkg_client: postgresql{{ release }}-client
  pkg: postgresql{{ release }}-server
  prepare_cluster:
@@ -57,6 +63,12 @@ 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 %}
  pkgs_deps:
    - libicu
  pkg_python: python3-psycopg2
 {%- endif %}
 {% if repo.use_upstream_repo == true %}
  {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
@@ -130,9 +142,9 @@ Suse:
  pkg_repo:
    name: pgdg-sles-{{ release }}
    humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
-    #Using sles-12 upstream repo for opensuse
+    # works for postgres 11 onwards
-    baseurl: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-12-$basearch'
+    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-12-$basearch/repodata/repomd.xml.key'
+    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/osmap.yaml
+++ b/postgres/osmap.yaml
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 {% import_yaml "postgres/repo.yaml" as repo %}
 Fedora:
  pkg_repo:
    # yamllint disable-line rule:line-length
    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/fedora/fedora-$releasever-$basearch'
  remove:
-    releases: ['9.4', '9.5', '9.6', '10',]
+    releases: ['9.4', '9.5', '9.6', '10']
 # vim: ft=sls
--- a/postgres/python.sls
+++ b/postgres/python.sls
@@ -5,7 +5,7 @@ include:
 postgresql-python:
  pkg.installed:
-    - name: {{ postgres.pkg_python}}
+    - name: {{ postgres.pkg_python }}
  {% if postgres.fromrepo %}
    - fromrepo: {{ postgres.fromrepo }}
  {% endif %}
--- a/postgres/repo.yaml
+++ b/postgres/repo.yaml
@@ -1,3 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 # This file allows to get PostgreSQL version and upstream repo settings
 # early from Pillar to set correct lookup dictionaty items
--- a/postgres/server/image.sls
+++ b/postgres/server/image.sls
@@ -5,20 +5,22 @@
 {%- if postgres.bake_image %}
 include:
  - postgres.server
 # An attempt to start PostgreSQL with `pg_ctl`
-
+postgresql-running:
 postgresql-start:
  cmd.run:
-    - name: pg_ctl -D {{ postgres.data_dir }} -l logfile start
+    - name: {{ postgres.bake_image_run_cmd }}
    - runas: {{ postgres.user }}
    - unless:
      - ps -p $(head -n 1 {{ postgres.data_dir }}/postmaster.pid) 2>/dev/null
    - require:
      - file: postgresql-pg_hba
 postgresql-service-reload:
  module.run:
    - name: test.true
    - require:
      - cmd: postgresql-running
 # Try to enable PostgreSQL in "manual" way
 postgresql-enable:
@@ -34,12 +36,6 @@ postgresql-enable:
    - name: 'true'
  {%- endif %}
    - require:
-      - cmd: postgresql-start
+      - cmd: postgresql-running
 {%- else %}
 postgresql-start:
  test.show_notification:
    - text: The 'postgres:bake_image' Pillar is disabled (set to 'False').
 {%- endif %}
--- 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/templates/mac_shortcut.sh
+++ b/postgres/templates/mac_shortcut.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
-shortcutName='${1}'
+shortcutName="${1}"
 app="postgres.app"
 Source="/Applications/$app"
 Destination="{{ homes }}/{{ user }}/Desktop/${shortcutName}"
 /usr/bin/osascript -e "tell application \"Finder\" to make alias file to POSIX file \"$Source\" at POSIX file \"$Destination\""
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -17,10 +17,19 @@ postgresql-profile:
    - defaults:
        bin_dir: {{ postgres.bin_dir }}
    {%- endif %}
 postgresql-pkg-deps:
  pkg.installed:
    - pkgs: {{ postgres.pkgs_deps }}
 # Add upstream repository for your distro
 postgresql-repo:
  pkgrepo.managed:
    {{- format_kwargs(postgres.pkg_repo) }}
    - require:
      - pkg: postgresql-pkg-deps
    - require_in:
      - pkg: postgresql-server
  {%- else -%}
@@ -39,6 +48,6 @@ postgresql-repo:
 postgresql-repo:
  test.show_notification:
    - text: |
-        PostgreSQL does not provide package repository for {{ grains['osfinger'] }}
+        PostgreSQL does not provide package repository for {{ salt['grains.get']('osfinger', grains.os) }}
 {%- endif %}
--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@@ -11,12 +11,12 @@ 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/
+cp ./*.md docs/
-cd docs/
+cd docs/ || exit
-m2r --overwrite *.md
+m2r --overwrite ./*.md
 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
--- 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',
@@ -63,7 +64,7 @@ module.exports = {
          }
          if (typeof commit.hash === `string`) {
-              commit.hash = commit.hash.substring(0, 7)
+              commit.shortHash = commit.hash.substring(0, 7)
          }
          if (typeof commit.subject === `string`) {
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -1,14 +1,18 @@
-# Overide by OS
+# frozen_string_literal: true
 # Overide by Platform
 pg_port = '5432'
-if os[:family] == 'debian' or os[:name] == 'suse'
+pg_port = '5433' if (platform[:family] == 'debian') || (platform[:family] == 'suse')
  pg_port = '5433'
 end
 control 'Postgres command' do
  title 'should match desired lines'
  # Can't use `%Q` here due to the `\`
-  describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do
+  describe command("su - postgres -c 'psql -p" + pg_port + %q( -qtc "\l+ db2"')) do
-    its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
+    its(:stdout) do
      should match(
        /db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space/
      )
    end
  end
 end
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config_spec.rb
@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 control 'Postgres configuration' do
  title 'should include the directory'
--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -1,9 +1,11 @@
-# Overide by OS
+# frozen_string_literal: true
 # Overide by Platform
 service_name = 'postgresql'
 pg_port = 5432
-if os[:name] == 'centos' and os[:release].start_with?('6')
+if (platform[:name] == 'centos') && platform[:release].start_with?('6')
  service_name = 'postgresql-9.6'
-elsif os[:family] == 'debian' or os[:name] == 'suse'
+elsif (platform[:family] == 'debian') || (platform[:family] == 'suse')
  pg_port = 5433
 end
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -1,3 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 name: default
 title: postgres formula
 maintainer: SaltStack Formulas
@@ -12,3 +15,4 @@ supports:
  - platform-name: suse
  - platform-name: freebsd
  - platform-name: amazon
  - platform-name: arch
--- a/test/salt/pillar/postgres.sls
+++ b/test/salt/pillar/postgres.sls
@@ -1,7 +1,7 @@
 # Port to use for the cluster -- can be used to provide a non-standard port
 # NOTE: If already set in the minion config, that value takes priority
-{%- if not (grains.os_family == 'Debian' or grains.osfinger == 'Leap-15') %}
+{%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'Leap-15' %}
 postgres.port: '5432'
 {%- else %}
 postgres.port: '5433'
@@ -10,7 +10,7 @@ postgres.port: '5433'
 postgres:
  # UPSTREAM REPO
  # Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
-  {%- if not (grains.os_family == 'Debian' or grains.osfinger == 'CentOS-6') %}
+  {%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'CentOS-6' %}
  use_upstream_repo: False
  {%- else %}
  use_upstream_repo: True
@@ -181,7 +181,7 @@ postgres:
        public:
          owner: localUser
      # enable per-db extension
-      {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
+      {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
      extensions:
        uuid-ossp:
          schema: 'public'
@@ -194,7 +194,7 @@ postgres:
      owner: localUser
  # optional extensions to install in schema
-  {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
+  {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
  extensions:
    uuid-ossp:
      schema: uuid-ossp