chore(release): 0.41.2 [skip ci]

## [0.41.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.1...v0.41.2) (2020-07-27)

### Bug Fixes

* **macros:** fix `format_kwargs` macro ([5e6511b](5e6511b783))

### Continuous Integration

* **kitchen:** ubuntu-2004-master-py3 added ([7978976](7978976543))
* **kitchen+travis:** use latest pre-salted images [skip ci] ([702323c](702323c24d))
* **travis:** ubuntu upgrade from 16 to 18 & 20 ([44568a6](44568a6806))

### Styles

* **libtofs.jinja:** use Black-inspired Jinja formatting [skip ci] ([8735cf8](8735cf8ad1))

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,68 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: '[BUG] '
-labels: 'bug'
-assignees: ''
-
----
-
-<!--
-Notes:
-1. Only post _bug reports_ here.
-2. Use the appropriate template for _feature requests_.
-3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
--->
-
-## Your setup
-### Formula commit hash / release tag
-<!-- Please specify the formula's commit hash and/or release tag that you are using. -->
-
-
-
-### Versions reports (master & minion)
-<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
-
-
-
-### Pillar / config used
-<!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
-
-
-
----
-
-## Bug details
-### Describe the bug
-<!-- A clear and concise description of what the bug is. -->
-
-
-
-### Steps to reproduce the bug
-<!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
-<!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
-<!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
-
-
-
-### Expected behaviour
-<!-- A clear and concise description of what you expected to happen. -->
-
-
-
-### Attempts to fix the bug
-<!-- Please mention any attempts you have made to fix the bug and what the results were. -->
-
-
-
-### Additional context
-<!-- Add any other context about the problem here. -->
-
-
-
----
-
-### Meta: How can this template be improved?
-<!-- Feel free to suggest how this template can be improved. -->
-
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,42 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: '[FEATURE] '
-labels: 'enhancement'
-assignees: ''
-
----
-
-<!--
-Notes:
-1. Only post _feature requests_ here.
-2. Use the appropriate template for _bug reports_.
-3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
--->
-
-### Is your feature request related to a problem?
-<!-- A clear and concise description of what the problem is. -->
-
-
-
-### Describe the solution you'd like
-<!-- A clear and concise description of what you want to happen. -->
-
-
-
-### Describe alternatives you've considered
-<!-- Describe any alternative solutions or features you've considered. -->
-
-
-
-### Additional context
-<!-- Add any other context about the feature request here. -->
-
-
-
----
-
-### Meta: How can this template be improved?
-<!-- Feel free to suggest how this template can be improved. -->
-
-

.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

.gitignore

@@ -105,7 +105,7 @@ ENV/
 .mypy_cache/
 
 # Bundler
-Gemfile.lock
+.bundle/
 
 # copied `.md` files used for conversion to `.rst` using `m2r`
 docs/*.md

.rubocop.yml

@@ -2,9 +2,15 @@
 # vim: ft=yaml
 ---
 # General overrides used across formulas in the org
-Metrics/LineLength:
+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`

.salt-lint

@@ -2,6 +2,7 @@
 # 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

.travis.yml

@@ -2,14 +2,18 @@
 # vim: ft=yaml
 ---
 ## Machine config
-dist: bionic
+os: 'linux'
-sudo: required
+arch: 'amd64'
-services:
+dist: 'bionic'
-  - docker
+version: '~> 1.0'
 
 ## Language and cache config
-language: ruby
+language: 'ruby'
-cache: bundler
+cache: 'bundler'
+
+## Services config
+services:
+  - docker
 
 ## Script to run for the test stage
 script:
@@ -18,85 +22,81 @@ script:
 ## Stages and jobs matrix
 stages:
   - test
-  - name: release
+  - name: 'release'
-    if: branch = master AND type != pull_request
+    if: 'branch = master AND type != pull_request'
 jobs:
-  allow_failures:
-    - env: Lint_rubocop
-  fast_finish: true
   include:
     ## Define the test stage that runs the linters (and testing matrix, if applicable)
 
-    # Run all of the linters in a single job (except `rubocop`)
+    # Run all of the linters in a single job
-    - language: node_js
+    - language: 'node_js'
-      node_js: lts/*
+      node_js: 'lts/*'
-      env: Lint
+      env: 'Lint'
-      name: 'Lint: salt-lint, yamllint & commitlint'
+      name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
-      before_install: skip
+      before_install: 'skip'
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
-        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
+        - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst'
-                       | xargs -I {} salt-lint {}
+                        | 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 `commitlint`
-        - npm install @commitlint/config-conventional -D
-        - npm install @commitlint/travis-cli -D
-        - commitlint-travis
-    # Run the `rubocop` linter in a separate job that is allowed to fail
-    # Once these lint errors are fixed, this can be merged into a single job
-    - language: node_js
-      node_js: lts/*
-      env: Lint_rubocop
-      name: 'Lint: rubocop'
-      before_install: skip
-      script:
         # 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 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-develop-py3
+    - env: INSTANCE=default-debian-10-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-develop-py3
+    - env: INSTANCE=default-ubuntu-2004-master-py3
-    # - env: INSTANCE=default-centos-7-develop-py3
+    # - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-fedora-30-develop-py3
+    - env: INSTANCE=default-centos-8-master-py3
-    # - env: INSTANCE=default-opensuse-leap-15-develop-py3
+    - env: INSTANCE=default-fedora-32-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-develop-py2
+    # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-arch-base-latest-develop-py2
+    - env: INSTANCE=default-opensuse-leap-152-master-py3
+    - env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=default-debian-10-3000-3-py3
+    # - env: INSTANCE=default-debian-9-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py3
+    # - env: INSTANCE=default-centos-8-3000-3-py3
+    # - env: INSTANCE=default-centos-7-3000-3-py3
+    # - env: INSTANCE=default-fedora-31-3000-3-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=default-ubuntu-1604-3000-3-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-3-py2
+    # - env: INSTANCE=default-debian-10-2019-2-py3
     # - env: INSTANCE=default-debian-9-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    - env: INSTANCE=default-centos-7-2019-2-py3
+    # - env: INSTANCE=default-ubuntu-1604-2019-2-py3
-    - env: INSTANCE=default-fedora-30-2019-2-py3
+    # - env: INSTANCE=default-centos-8-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
+    # - env: INSTANCE=default-centos-7-2019-2-py3
-    # - env: INSTANCE=default-amazonlinux-2-2019-2-py2
+    # - env: INSTANCE=default-fedora-31-2019-2-py3
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
+    # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
-    # - env: INSTANCE=default-debian-9-2018-3-py2
+    # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    - env: INSTANCE=default-ubuntu-1604-2018-3-py2
+    # - env: INSTANCE=default-centos-6-2019-2-py2
-    # - env: INSTANCE=default-centos-7-2018-3-py2
+    # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
-    # - env: INSTANCE=default-fedora-29-2018-3-py2
+    - env: INSTANCE=default-arch-base-latest-2019-2-py2
-    - env: INSTANCE=default-opensuse-leap-15-2018-3-py2
-    # - env: INSTANCE=default-amazonlinux-2-2018-3-py2
-    # - env: INSTANCE=default-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=default-debian-8-2017-7-py2
-    # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
-    - env: INSTANCE=default-centos-6-2017-7-py2
-    # - env: INSTANCE=default-fedora-29-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
-    # - env: INSTANCE=default-amazonlinux-2-2017-7-py2
-    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
 
     ## Define the release stage that runs `semantic-release`
-    - stage: release
+    - stage: 'release'
-      language: node_js
+      language: 'node_js'
-      node_js: lts/*
+      node_js: 'lts/*'
-      env: Release
+      env: 'Release'
       name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
-      before_install: skip
+      before_install: 'skip'
       script:
         # Update `AUTHORS.md`
         - export MAINTAINER_TOKEN=${GH_TOKEN}
@@ -104,12 +104,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
+        # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
+        edge: true
         # Run `semantic-release`
-          - npx semantic-release@15
+        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

AUTHORS.md

@@ -4,13 +4,13 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|70
+<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)|123
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|62
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|53
+<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
@@ -37,7 +37,7 @@ Avatar|Contributor|Contributions
 <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 +55,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
@@ -70,4 +69,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-27.

CHANGELOG.md

@@ -1,5 +1,118 @@
 # Changelog
 
+## [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)
 
 

CODEOWNERS

@@ -0,0 +1,40 @@
+# 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/kitchen                                @saltstack-formulas/ssf
+/docs/AUTHORS.rst                           @saltstack-formulas/ssf
+/docs/CHANGELOG.rst                         @saltstack-formulas/ssf
+/docs/TOFS_pattern.rst                      @saltstack-formulas/ssf
+/postgres/libsaltcli.jinja                  @saltstack-formulas/ssf
+/postgres/libtofs.jinja                     @saltstack-formulas/ssf
+/test/integration/**/inspec.yml             @saltstack-formulas/ssf
+/test/integration/**/README.md              @saltstack-formulas/ssf
+/.gitignore                                 @saltstack-formulas/ssf
+/.cirrus.yml                                @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)

FORMULA

@@ -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.40.3
+version: 0.41.2
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula

Gemfile

@@ -5,3 +5,7 @@ source 'https://rubygems.org'
 gem 'kitchen-docker', '>= 2.9'
 gem 'kitchen-inspec', '>= 1.1'
 gem 'kitchen-salt', '>= 0.6.0'
+
+group :vagrant do
+  gem 'kitchen-vagrant'
+end

Gemfile.lock

@@ -0,0 +1,534 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.4.3)
+      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.338.0)
+    aws-sdk-apigateway (1.48.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-apigatewayv2 (1.23.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-athena (1.30.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-autoscaling (1.22.0)
+      aws-sdk-core (~> 3, >= 3.52.1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-budgets (1.32.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudformation (1.41.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudfront (1.33.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudhsm (1.24.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudhsmv2 (1.26.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudtrail (1.26.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatch (1.41.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatchlogs (1.34.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codecommit (1.37.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codedeploy (1.34.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codepipeline (1.34.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.48.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.103.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-costandusagereportservice (1.24.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-dynamodb (1.51.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ec2 (1.174.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecr (1.34.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecs (1.67.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-efs (1.32.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-eks (1.39.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticache (1.40.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticbeanstalk (1.34.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancing (1.25.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancingv2 (1.47.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticsearchservice (1.39.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-firehose (1.31.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-iam (1.43.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kafka (1.23.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kinesis (1.26.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.36.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-lambda (1.46.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-organizations (1.17.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-rds (1.92.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-redshift (1.46.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53 (1.40.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53domains (1.25.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53resolver (1.17.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.73.0)
+      aws-sdk-core (~> 3, >= 3.102.1)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-securityhub (1.29.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ses (1.33.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sms (1.23.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sns (1.27.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.30.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ssm (1.84.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    azure_graph_rbac (0.17.2)
+      ms_rest_azure (~> 0.12.0)
+    azure_mgmt_key_vault (0.17.6)
+      ms_rest_azure (~> 0.12.0)
+    azure_mgmt_resources (0.17.9)
+      ms_rest_azure (~> 0.12.0)
+    azure_mgmt_security (0.18.2)
+      ms_rest_azure (~> 0.12.0)
+    azure_mgmt_storage (0.21.2)
+      ms_rest_azure (~> 0.12.0)
+    bcrypt_pbkdf (1.0.1)
+    builder (3.2.4)
+    chef-config (16.2.73)
+      addressable
+      chef-utils (= 16.2.73)
+      fuzzyurl
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      tomlrb (~> 1.2)
+    chef-telemetry (1.0.8)
+      chef-config
+      concurrent-ruby (~> 1.0)
+      ffi-yajl (~> 2.2)
+    chef-utils (16.2.73)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.6)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    diff-lcs (1.4.4)
+    docker-api (1.34.2)
+      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)
+    equatable (0.6.1)
+    erubi (1.9.0)
+    excon (0.75.0)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.13.1)
+    ffi-yajl (2.3.3)
+      libyajl2 (~> 1.2)
+    fuzzyurl (0.9.0)
+    google-api-client (0.34.1)
+      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.10.0)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.12)
+    gssapi (1.3.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hana (1.3.6)
+    hashie (3.6.0)
+    htmlentities (4.3.4)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    inifile (3.0.0)
+    inspec (4.21.3)
+      faraday_middleware (~> 0.12.2)
+      inspec-core (= 4.21.3)
+      train (~> 3.0)
+      train-aws (~> 0.1)
+      train-habitat (~> 0.1)
+      train-winrm (~> 0.2)
+    inspec-core (4.21.3)
+      addressable (~> 2.4)
+      chef-telemetry (~> 1.0)
+      faraday (>= 0.9.0)
+      hashie (~> 3.4)
+      htmlentities (~> 4.3)
+      json_schemer (~> 0.2.1)
+      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)
+      term-ansicolor (~> 1.7)
+      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.1)
+    kitchen-docker (2.10.0)
+      test-kitchen (>= 1.0.0)
+    kitchen-inspec (2.0.0)
+      hashie (~> 3.4)
+      inspec (>= 2.2.64, < 5.0)
+      test-kitchen (>= 1.6, < 3)
+    kitchen-salt (0.6.3)
+      hashie (>= 3.5)
+      test-kitchen (>= 1.4)
+    kitchen-vagrant (1.6.1)
+      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.1)
+    mixlib-config (3.0.6)
+      tomlrb
+    mixlib-install (3.12.1)
+      mixlib-shellout
+      mixlib-versioning
+      thor
+    mixlib-log (3.0.8)
+    mixlib-shellout (3.0.9)
+    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.14.1)
+    multipart-post (2.1.1)
+    necromancer (0.5.1)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
+    nori (2.6.0)
+    os (1.1.0)
+    parallel (1.19.2)
+    parslet (1.8.2)
+    pastel (0.7.4)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.5)
+    regexp_parser (1.7.1)
+    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.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      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.3)
+    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.1.8)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    test-kitchen (2.5.2)
+      bcrypt_pbkdf (~> 1.0)
+      ed25519 (~> 1.2)
+      license-acceptance (~> 1.0, >= 1.0.11)
+      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)
+    tins (1.25.0)
+      sync
+    tomlrb (1.2.9)
+    train (3.3.6)
+      activesupport (>= 5.2.4.3, < 6.0.0)
+      azure_graph_rbac (~> 0.16)
+      azure_mgmt_key_vault (~> 0.17)
+      azure_mgmt_resources (~> 0.15)
+      azure_mgmt_security (~> 0.18)
+      azure_mgmt_storage (~> 0.18)
+      docker-api (~> 1.26)
+      google-api-client (>= 0.23.9, < 0.35.0)
+      googleauth (>= 0.6.6, < 0.11.0)
+      inifile (~> 3.0)
+      train-core (= 3.3.6)
+      train-winrm (~> 0.2)
+    train-aws (0.1.17)
+      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-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.6)
+      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.6)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    tty-box (0.5.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.6)
+      tty-cursor (~> 0.7)
+    tty-color (0.5.1)
+    tty-cursor (0.7.1)
+    tty-prompt (0.21.0)
+      necromancer (~> 0.5.0)
+      pastel (~> 0.7.0)
+      tty-reader (~> 0.7.0)
+    tty-reader (0.7.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.7)
+      wisper (~> 2.0.0)
+    tty-screen (0.8.0)
+    tty-table (0.11.0)
+      equatable (~> 0.6)
+      necromancer (~> 0.5)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.5)
+      tty-screen (~> 0.7)
+    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.4)
+      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.1)
+      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
+  kitchen-docker (>= 2.9)
+  kitchen-inspec (>= 1.1)
+  kitchen-salt (>= 0.6.0)
+  kitchen-vagrant
+
+BUNDLED WITH
+   2.1.2

docs/AUTHORS.rst

@@ -15,25 +15,25 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - Contributions
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 70
+     - 123
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
      - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
      - 62
    * - :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>`_
-     - 53
+     - 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
@@ -112,8 +112,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 +166,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
@@ -206,4 +203,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-10-10.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-07-27.

docs/CHANGELOG.rst

@@ -2,6 +2,139 @@
 Changelog
 =========
 
+`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)
 -------------------------------------------------------------------------------------------------------------
 

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.
-

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``
 ^^^^^^^^^^^^^^^^^^^^^

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'

kitchen.yml

@@ -11,167 +11,122 @@ 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-10-develop-py3
+  - name: debian-10-master-py3
     driver:
-      image: netmanagers/salt-develop-py3:debian-10
+      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-30-develop-py3
     driver:
-      image: netmanagers/salt-develop-py3:fedora-30
+      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: opensuse/leap:15
+      image: saltimages/salt-master-py3:fedora-32
-      provision_command:
+  - name: fedora-31-master-py3
-        # yamllint disable-line rule:line-length
+    driver:
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
+      image: saltimages/salt-master-py3:fedora-31
-        - systemctl enable sshd.service
+  - name: opensuse-leap-152-master-py3
+    driver:
+      image: saltimages/salt-master-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
-    provisioner:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-      salt_bootstrap_options: -XdPfrq -x python3 git develop
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-develop-py2
+  - name: amazonlinux-2-master-py3
     driver:
-      image: netmanagers/salt-develop-py2:amazonlinux-2
+      image: saltimages/salt-master-py3:amazonlinux-2
-      provision_command:
+
-        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  ## SALT `3000.3`
-        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
+  - name: debian-10-3000-3-py3
-  - name: arch-base-latest-develop-py2
     driver:
-      image: netmanagers/salt-develop-py2:arch-base-latest
+      image: saltimages/salt-3000.3-py3:debian-10
-      provision_command:
+  - name: debian-9-3000-3-py3
-        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+    driver:
-        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
+      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-30-2019-2-py3
+  - name: fedora-31-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:fedora-30
+      image: saltimages/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-15-2019-2-py3
+  - name: opensuse-leap-152-2019-2-py3
     driver:
-      image: opensuse/leap:15
+      image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
-        - systemctl enable sshd.service
       run_command: /usr/lib/systemd/systemd
-    provisioner:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-      salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-2019-2-py2
+  - name: amazonlinux-2-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py2:amazonlinux-2
+      image: saltimages/salt-2019.2-py3:amazonlinux-2
+  - name: centos-6-2019-2-py2
+    driver:
+      image: saltimages/salt-2019.2-py2:centos-6
+      run_command: /sbin/init
+  - name: amazonlinux-1-2019-2-py2
+    driver:
+      image: saltimages/salt-2019.2-py2:amazonlinux-1
+      run_command: /sbin/init
   - name: arch-base-latest-2019-2-py2
     driver:
-      image: netmanagers/salt-2019.2-py2:arch-base-latest
+      image: saltimages/salt-2019.2-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `2018.3`
-  - name: debian-9-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:debian-9
-  - name: ubuntu-1604-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
-  - name: centos-7-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:centos-7
-  - name: fedora-29-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:fedora-29
-  - name: opensuse-leap-15-2018-3-py2
-    driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
-        - systemctl enable sshd.service
-      run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:amazonlinux-2
-  - name: arch-base-latest-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `2017.7`
-  - name: debian-8-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:debian-8
-  - name: ubuntu-1604-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:ubuntu-16.04
-  - name: centos-6-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:centos-6
-      run_command: /sbin/init
-  - name: fedora-29-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:fedora-29
-  - name: opensuse-leap-15-2017-7-py2
-    driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
-        - systemctl enable sshd.service
-      run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:amazonlinux-2
-  - name: arch-base-latest-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
 provisioner:

postgres/codenamemap.yaml

@@ -35,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 %}
 
@@ -54,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

postgres/defaults.yaml

@@ -9,6 +9,7 @@ postgres:
   version: '10'
   pkg: postgresql
   pkgs_extra: []
+  pkgs_deps: []
   pkg_client: postgresql-client
   pkg_dev: postgresql-devel
   pkg_dev_deps: []
@@ -76,6 +77,7 @@ postgres:
     sysrc: false
 
   bake_image: false
+  bake_image_run_cmd: pg_ctl start
 
   fromrepo: ''
 

postgres/libtofs.jinja

@@ -1,40 +1,37 @@
-{%- macro files_switch(source_files,
+{%- macro files_switch(
+      source_files,
       lookup=None,
-                       default_files_switch=['id', 'os_family'],
+      default_files_switch=["id", "os_family"],
       indent_width=6,
-                       use_subpath=False) %}
+      use_subpath=False
-  {#-
+    ) %}
+{#-
     Returns a valid value for the "source" parameter of a "file.managed"
     state function. This makes easier the usage of the Template Override and
     Files Switch (TOFS) pattern.
-
     Params:
       * source_files: ordered list of files to look for
-      * lookup: key under '<tplroot>:tofs:source_files' to prepend to the
+      * lookup: key under "<tplroot>:tofs:source_files" to prepend to the
         list of source files
       * default_files_switch: if there's no config (e.g. pillar)
-        '<tplroot>:tofs:files_switch' this is the ordered list of grains to
+        "<tplroot>:tofs:files_switch" this is the ordered list of grains to
         use as selector switch of the directories under
         "<path_prefix>/files"
-      * indent_witdh: indentation of the result value to conform to YAML
+      * indent_width: indentation of the result value to conform to YAML
       * use_subpath: defaults to `False` but if set, lookup the source file
         recursively from the current state directory up to `tplroot`
-
     Example (based on a `tplroot` of `xxx`):
-
     If we have a state:
-
       Deploy configuration:
         file.managed:
           - name: /etc/yyy/zzz.conf
-          - source: {{ files_switch(['/etc/yyy/zzz.conf', '/etc/yyy/zzz.conf.jinja'],
+          - 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,67 +43,73 @@
             - salt://xxx/files/default/etc/yyy/zzz.conf
             - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
           - template: jinja
-  #}
+#}
-  {#- Get the `tplroot` from `tpldir` #}
+{#-   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 an empty list #}
-  {%- 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 #}
+{#-   Append the default source_files #}
-  {%- set src_files = src_files + source_files %}
+{%-   set src_files = src_files + source_files %}
-  {#- Only add to [''] when supporting older TOFS implementations #}
+{#-   Only add to [""] when supporting older TOFS implementations #}
-  {%- set path_prefix_exts = [''] %}
+{%-   set path_prefix_exts = [""] %}
-  {%- if use_subpath and tplroot != tpldir %}
+{%-   if use_subpath and tplroot != tpldir %}
-    {#- Walk directory tree to find {{ files_dir }} #}
+{#-     Walk directory tree to find {{ files_dir }} #}
-    {%- set subpath_parts = tpldir.lstrip(tplroot).lstrip('/').split('/') %}
+{%-     set subpath_parts = tpldir.lstrip(tplroot).lstrip("/").split("/") %}
-    {%- for path in subpath_parts %}
+{%-     for path in subpath_parts %}
-      {%- set subpath = subpath_parts[0:loop.index] | join('/') %}
+{%-       set subpath = subpath_parts[0 : loop.index] | join("/") %}
-      {%- do path_prefix_exts.append('/' ~ subpath) %}
+{%-       do path_prefix_exts.append("/" ~ subpath) %}
-    {%- endfor %}
+{%-     endfor %}
-  {%- endif %}
+{%-   endif %}
-  {%- for path_prefix_ext in path_prefix_exts|reverse %}
+{%-   for path_prefix_ext in path_prefix_exts | reverse %}
-    {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
+{%-     set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
-    {#- For older TOFS implementation, use `files_switch` from the config #}
+{#-     For older TOFS implementation, use `files_switch` from the config #}
-    {#- Use the default, new method otherwise #}
+{#-     Use the default, new method otherwise #}
-    {%- set fsl = salt['config.get'](
+{%-     set fsl = salt["config.get"](
-        tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch',
+          tplroot ~ path_prefix_ext | replace("/", ":") ~ ":files_switch",
-        files_switch_list
+          files_switch_list,
+        ) %}
+{#-     Append an empty value to evaluate as `default` in the loop below #}
+{%-     if "" not in fsl %}
+{%-       set fsl = fsl + [""] %}
+{%-     endif %}
+{%-     for fs in fsl %}
+{%-       for src_file in src_files %}
+{%-         if fs %}
+{%-           set fs_dirs = salt["config.get"](fs, fs) %}
+{%-         else %}
+{%-           set fs_dirs = salt["config.get"](
+                tplroot ~ ":tofs:dirs:default", "default"
+              ) %}
+{%-         endif %}
+{#-         Force the `config.get` lookup result as a list where necessary #}
+{#-         since we need to also handle grains that are lists #}
+{%-         if fs_dirs is string %}
+{%-           set fs_dirs = [fs_dirs] %}
+{%-         endif %}
+{%-         for fs_dir in fs_dirs %}
+{#-           strip empty elements by using a select #}
+{%-           set url = (
+                [
+                  "- salt:/",
+                  path_prefix_inc_ext.strip("/"),
+                  files_dir.strip("/"),
+                  fs_dir.strip("/"),
+                  src_file.strip("/"),
+                ]
+                | select
+                | join("/")
               ) %}
-    {#- Append an empty value to evaluate as `default` in the loop below #}
-    {%- if '' not in fsl %}
-      {%- do fsl.append('') %}
-    {%- endif %}
-    {%- for fs in fsl %}
-      {%- for src_file in src_files %}
-        {%- if fs %}
-          {%- set fs_dirs = salt['config.get'](fs, fs) %}
-        {%- else %}
-          {%- set fs_dirs = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
-        {%- endif %}
-        {#- Force the `config.get` lookup result as a list where necessary #}
-        {#- since we need to also handle grains that are lists #}
-        {%- if fs_dirs is string %}
-          {%- set fs_dirs = [fs_dirs] %}
-        {%- endif %}
-        {%- for fs_dir in fs_dirs %}
-          {%- set url = [
-              '- salt:/',
-              path_prefix_inc_ext.strip('/'),
-              files_dir.strip('/'),
-              fs_dir.strip('/'),
-              src_file.strip('/'),
-          ] | select | join('/') %}
 {{ url | indent(indent_width, true) }}
-        {%- endfor %}
+{%-         endfor %}
-      {%- endfor %}
+{%-       endfor %}
-    {%- endfor %}
+{%-     endfor %}
-  {%- endfor %}
+{%-   endfor %}
 {%- endmacro %}

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 -%}
 

postgres/osfamilymap.yaml

@@ -12,6 +12,7 @@ Arch:
   pkg_dev: postgresql
 
 Debian:
+  pkgs_deps: ['python3-apt']
   pkg_repo:
     humanname: PostgreSQL Official Repository
     key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'

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 %}

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\""
-

postgres/upstream.sls

@@ -17,10 +17,17 @@ 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
 
   {%- else -%}
 

pre-commit_semantic-release.sh

@@ -14,9 +14,9 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
 sudo -H pip 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

release.config.js

@@ -63,7 +63,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`) {

test/integration/default/controls/command_spec.rb

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 # Overide by Platform
 pg_port = '5432'
-if platform[:family] == 'debian' or platform[:family] == '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

test/integration/default/controls/config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 control 'Postgres configuration' do
   title 'should include the directory'
 

test/integration/default/controls/services_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Overide by Platform
 service_name = 'postgresql'
 pg_port = 5432
-if platform[:name] == 'centos' and platform[:release].start_with?('6')
+if (platform[:name] == 'centos') && platform[:release].start_with?('6')
   service_name = 'postgresql-9.6'
-elsif platform[:family] == 'debian' or platform[:family] == 'suse'
+elsif (platform[:family] == 'debian') || (platform[:family] == 'suse')
   pg_port = 5433
 end