chore(release): 0.39.1 [skip ci]

## [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))
Merge pull request #285 from myii/chore/standardise-structure
2019-09-01 11:09:44 +00:00 · 2019-09-01 11:42:37 +02:00 · 2019-08-28 07:40:17 +01:00 · 2019-08-28 07:39:55 +01:00 · 2019-08-17 16:46:14 +01:00 · 2019-08-17 16:06:31 +01:00
37 changed files with 2381 additions and 173 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,122 @@
-.kitchen/
-*.swp
-*.swo
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a packager
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.kitchen
+.kitchen.local.yml
+kitchen.local.yml
+junit-*.xml
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# Bundler
+Gemfile.lock
+
+# copied `.md` files used for conversion to `.rst` using `m2r`
+docs/*.md
+
+# Vim
+*.sw?
+
+## Collected when centralising formulas (check and sort)
+# `collectd-formula`
+.pytest_cache/
+/.idea/
+Dockerfile.*_*
+ignore/
+tmp/
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,26 +0,0 @@
---
-driver:
-  name: vagrant
-  network:
-    - ["private_network", { ip: "192.168.33.33" }]
-
-provisioner:
-  name: salt_solo
-  formula: postgres
-  pillars-from-files:
-    postgres.sls: pillar.example
-  pillars:
-    top.sls:
-      base:
-        "*":
-          - postgres
-  state_top:
-    base:
-      "*":
-        - postgres
-
-platforms:
-  - name: ubuntu-14.04
-
-suites:
-  - name: default
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+stages:
+  - test
+  - lint
+  - name: release
+    if: branch = master AND type != pull_request
+
+sudo: required
+cache: bundler
+language: ruby
+dist: xenial
+
+services:
+  - docker
+
+# Make sure the instances listed below match up with
+# the `platforms` defined in `kitchen.yml`
+env:
+  matrix:
+    - INSTANCE: default-debian-10-develop-py3
+    # - INSTANCE: default-ubuntu-1804-develop-py3
+    # - INSTANCE: default-centos-7-develop-py3
+    # - INSTANCE: default-fedora-30-develop-py3
+    # - INSTANCE: default-opensuse-leap-15-develop-py3
+    # - INSTANCE: default-amazonlinux-2-develop-py2
+    # - INSTANCE: default-debian-9-2019-2-py3
+    # - INSTANCE: default-ubuntu-1804-2019-2-py3
+    - INSTANCE: default-centos-7-2019-2-py3
+    - INSTANCE: default-fedora-30-2019-2-py3
+    # - INSTANCE: default-opensuse-leap-15-2019-2-py3
+    # - INSTANCE: default-amazonlinux-2-2019-2-py2
+    # - 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-15-2018-3-py2
+    # - INSTANCE: default-amazonlinux-2-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-29-2017-7-py2
+    # - INSTANCE: default-opensuse-leap-15-2017-7-py2
+    # - INSTANCE: default-amazonlinux-2-2017-7-py2
+
+script:
+  - bin/kitchen verify ${INSTANCE}
+
+jobs:
+  include:
+    # Define the `lint` stage (runs `yamllint` and `commitlint`)
+    - stage: lint
+      language: node_js
+      node_js: lts/*
+      before_install: skip
+      script:
+        # Install and run `yamllint`
+        - pip install --user yamllint
+        # yamllint disable-line rule:line-length
+        - yamllint -s . .yamllint pillar.example test/salt/pillar/postgres.sls
+        # Install and run `commitlint`
+        - npm install @commitlint/config-conventional -D
+        - npm install @commitlint/travis-cli -D
+        - commitlint-travis
+    # Define the release stage that runs `semantic-release`
+    - stage: release
+      language: node_js
+      node_js: lts/*
+      before_install: skip
+      script:
+        # Update `AUTHORS.md`
+        - export MAINTAINER_TOKEN=${GH_TOKEN}
+        - go get github.com/myii/maintainer
+        - maintainer contributor
+
+        # Install all dependencies required for `semantic-release`
+        - npm install @semantic-release/changelog@3 -D
+        - npm install @semantic-release/exec@3 -D
+        - npm install @semantic-release/git@7 -D
+      deploy:
+        provider: script
+        skip_cleanup: true
+        script:
+          # Run `semantic-release`
+          - npx semantic-release@15
--- a/.yamllint
+++ b/.yamllint
@@ -0,0 +1,23 @@
+# -*- 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. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
+ignore: |
+  node_modules/
+  pillar.example
+  postgres/codenamemap.yaml
+  postgres/osfamilymap.yaml
+  postgres/osmap.yaml
+  postgres/repo.yaml
+  test/salt/pillar/postgres.sls
+
+rules:
+  line-length:
+    # Increase from default of `80`
+    # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
+    max: 88
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -0,0 +1,72 @@
+# Authors
+
+This list is sorted by the number of commits per contributor in _descending_ order.
+
+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)|57
+<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)|50
+<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://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://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
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|7
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13106485?v=4' width='36' height='36' alt='@dynjnelson'>|[@dynjnelson](https://github.com/dynjnelson)|7
+<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://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
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2995329?v=4' width='36' height='36' alt='@t0fik'>|[@t0fik](https://github.com/t0fik)|5
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>|[@stp-ip](https://github.com/stp-ip)|4
+<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://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://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
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/83323?v=4' width='36' height='36' alt='@cro'>|[@cro](https://github.com/cro)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8599847?v=4' width='36' height='36' alt='@campbellmc'>|[@campbellmc](https://github.com/campbellmc)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/306240?v=4' width='36' height='36' alt='@UtahDave'>|[@UtahDave](https://github.com/UtahDave)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/215487?v=4' width='36' height='36' alt='@fcrozat'>|[@fcrozat](https://github.com/fcrozat)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1468874?v=4' width='36' height='36' alt='@Laogeodritt'>|[@Laogeodritt](https://github.com/Laogeodritt)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/650691?v=4' width='36' height='36' alt='@itbabu'>|[@itbabu](https://github.com/itbabu)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/296523?v=4' width='36' height='36' alt='@mkotsbak'>|[@mkotsbak](https://github.com/mkotsbak)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1331128?v=4' width='36' height='36' alt='@mattysads'>|[@mattysads](https://github.com/mattysads)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3705387?v=4' width='36' height='36' alt='@mbrannigan'>|[@mbrannigan](https://github.com/mbrannigan)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/8399114?v=4' width='36' height='36' alt='@fortunejuggle'>|[@fortunejuggle](https://github.com/fortunejuggle)|1
+<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
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/2814878?v=4' width='36' height='36' alt='@thomasrossetto'>|[@thomasrossetto](https://github.com/thomasrossetto)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>|[@thatch45](https://github.com/thatch45)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/444668?v=4' width='36' height='36' alt='@tobio'>|[@tobio](https://github.com/tobio)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2097647?v=4' width='36' height='36' alt='@XRasher'>|[@XRasher](https://github.com/XRasher)|1
+<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://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-09-01.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,102 @@
+# Changelog
+
+## [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)
+
+
+### Continuous Integration
+
+* **kitchen:** remove `python*-pip` installation ([d999597](https://github.com/saltstack-formulas/postgres-formula/commit/d999597))
+* **kitchen+travis:** modify matrix to include `develop` platform ([3f81439](https://github.com/saltstack-formulas/postgres-formula/commit/3f81439))
+
+
+### Features
+
+* **debian:** add buster support ([904ba27](https://github.com/saltstack-formulas/postgres-formula/commit/904ba27))
+
+## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31)
+
+
+### Continuous Integration
+
+* **travis:** reduce matrix down to 6 instances ([2ff919f](https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f))
+
+
+### Tests
+
+* **`services_spec`:** remove temporary `suse` conditional ([81165fc](https://github.com/saltstack-formulas/postgres-formula/commit/81165fc))
+* **command_spec:** use cleaner `match` string using `%r` ([a054cea](https://github.com/saltstack-formulas/postgres-formula/commit/a054cea))
+* **locale:** improve test using locale `en_US.UTF-8` ([7796064](https://github.com/saltstack-formulas/postgres-formula/commit/7796064))
+
+## [0.37.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3) (2019-05-16)
+
+
+### Bug Fixes
+
+* **freebsd-user:** fix FreeBSD daemon's user for PostgreSQL >= 9.6 ([8745365](https://github.com/saltstack-formulas/postgres-formula/commit/8745365)), closes [#263](https://github.com/saltstack-formulas/postgres-formula/issues/263)
+
+## [0.37.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.1...v0.37.2) (2019-05-12)
+
+
+### Bug Fixes
+
+* **sysrc-svc:** workaround *BSD minion indefinitely hanging on start ([0aa8b4a](https://github.com/saltstack-formulas/postgres-formula/commit/0aa8b4a))
+
+## [0.37.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.0...v0.37.1) (2019-05-06)
+
+
+### Documentation
+
+* **readme:** fix link for Travis badge ([850ca6a](https://github.com/saltstack-formulas/postgres-formula/commit/850ca6a))
+
+# [0.37.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.36.0...v0.37.0) (2019-05-06)
+
+
+### Code Refactoring
+
+* **kitchen:** prefer `kitchen.yml` to `.kitchen.yml` ([8f7cbde](https://github.com/saltstack-formulas/postgres-formula/commit/8f7cbde))
+
+
+### Continuous Integration
+
+* **gemfile:** prepare for `inspec` testing ([157e169](https://github.com/saltstack-formulas/postgres-formula/commit/157e169))
+* **kitchen:** use pre-salted images as used in `template-formula` ([611ec11](https://github.com/saltstack-formulas/postgres-formula/commit/611ec11))
+* **kitchen+travis:** use newly available pre-salted images ([7b7aadc](https://github.com/saltstack-formulas/postgres-formula/commit/7b7aadc))
+* **pillar_from_files:** use custom pillar based on `pillar.example` ([c64d9e4](https://github.com/saltstack-formulas/postgres-formula/commit/c64d9e4))
+* **travis:** add `.travis.yml` based on `template-formula` ([6467df7](https://github.com/saltstack-formulas/postgres-formula/commit/6467df7))
+
+
+### Documentation
+
+* **readme:** update `Testing` section for `inspec` ([4cfde8d](https://github.com/saltstack-formulas/postgres-formula/commit/4cfde8d))
+
+
+### Features
+
+* implement `semantic-release` ([7d3aa19](https://github.com/saltstack-formulas/postgres-formula/commit/7d3aa19))
+
+
+### Tests
+
+* **inspec:** add tests for multiple ports and postgres versions ([bf6a653](https://github.com/saltstack-formulas/postgres-formula/commit/bf6a653))
+* **inspec:** enable `use_upstream_repo` for `debian` & `centos-6` ([49fdd33](https://github.com/saltstack-formulas/postgres-formula/commit/49fdd33))
+* **inspec:** replace `serverspec` with `inspec` tests ([58ac122](https://github.com/saltstack-formulas/postgres-formula/commit/58ac122))
+* **inspec:** use relaxed command output match for the time being ([3c53684](https://github.com/saltstack-formulas/postgres-formula/commit/3c53684))
--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+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.39.1
+release: 1
+minimum_version: 2016.11
+summary: Postgres formula
+description: Formula to install and configure PostgreSQL
+top_level_dir: postgres
--- a/7
+++ b/7
@@ -1,5 +1,6 @@
 source "https://rubygems.org"

-gem "test-kitchen", "> 1.2.0"
-gem "kitchen-vagrant"
-gem "kitchen-salt"
+gem 'kitchen-docker', '>= 2.9'
+gem 'kitchen-salt', '>= 0.6.0'
+gem 'kitchen-inspec', '>= 1.1'
+
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,26 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    kitchen-salt (0.0.19)
-    kitchen-vagrant (0.15.0)
-      test-kitchen (~> 1.0)
-    mixlib-shellout (2.0.1)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    safe_yaml (1.0.4)
-    test-kitchen (1.3.1)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.7)
-      safe_yaml (~> 1.0)
-      thor (~> 0.18)
-    thor (0.19.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  kitchen-salt
-  kitchen-vagrant
-  test-kitchen (> 1.2.0)
--- a/bin/kitchen
+++ b/bin/kitchen
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'kitchen' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+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.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("test-kitchen", "kitchen")
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+    extends: ['@commitlint/config-conventional'],
+};
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -0,0 +1,206 @@
+.. role:: raw-html-m2r(raw)
+   :format: html
+
+
+Authors
+=======
+
+This list is sorted by the number of commits per contributor in *descending* order.
+
+.. list-table::
+   :header-rows: 1
+
+   * - 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>`_
+     - 57
+   * - :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>`_
+     - 50
+   * - :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://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'>`
+     - `@dferrantelli <https://github.com/dferrantelli>`_
+     - 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>`_
+     - 8
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
+     - `@iggy <https://github.com/iggy>`_
+     - 7
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13106485?v=4' width='36' height='36' alt='@dynjnelson'>`
+     - `@dynjnelson <https://github.com/dynjnelson>`_
+     - 7
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
+     - `@alxwr <https://github.com/alxwr>`_
+     - 5
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyr'>`
+     - `@audreyr <https://github.com/audreyr>`_
+     - 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>`_
+     - 5
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2995329?v=4' width='36' height='36' alt='@t0fik'>`
+     - `@t0fik <https://github.com/t0fik>`_
+     - 5
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>`
+     - `@stp-ip <https://github.com/stp-ip>`_
+     - 4
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :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://avatars3.githubusercontent.com/u/1078927?v=4' width='36' height='36' alt='@Ken-2scientists'>`
+     - `@Ken-2scientists <https://github.com/Ken-2scientists>`_
+     - 2
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :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'>`
+     - `@coffee-powered-coder <https://github.com/coffee-powered-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>`_
+     - 1
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/83323?v=4' width='36' height='36' alt='@cro'>`
+     - `@cro <https://github.com/cro>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8599847?v=4' width='36' height='36' alt='@campbellmc'>`
+     - `@campbellmc <https://github.com/campbellmc>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/306240?v=4' width='36' height='36' alt='@UtahDave'>`
+     - `@UtahDave <https://github.com/UtahDave>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/215487?v=4' width='36' height='36' alt='@fcrozat'>`
+     - `@fcrozat <https://github.com/fcrozat>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1468874?v=4' width='36' height='36' alt='@Laogeodritt'>`
+     - `@Laogeodritt <https://github.com/Laogeodritt>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/650691?v=4' width='36' height='36' alt='@itbabu'>`
+     - `@itbabu <https://github.com/itbabu>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/296523?v=4' width='36' height='36' alt='@mkotsbak'>`
+     - `@mkotsbak <https://github.com/mkotsbak>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1331128?v=4' width='36' height='36' alt='@mattysads'>`
+     - `@mattysads <https://github.com/mattysads>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3705387?v=4' width='36' height='36' alt='@mbrannigan'>`
+     - `@mbrannigan <https://github.com/mbrannigan>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/8399114?v=4' width='36' height='36' alt='@fortunejuggle'>`
+     - `@fortunejuggle <https://github.com/fortunejuggle>`_
+     - 1
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/2814878?v=4' width='36' height='36' alt='@thomasrossetto'>`
+     - `@thomasrossetto <https://github.com/thomasrossetto>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>`
+     - `@thatch45 <https://github.com/thatch45>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/444668?v=4' width='36' height='36' alt='@tobio'>`
+     - `@tobio <https://github.com/tobio>`_
+     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2097647?v=4' width='36' height='36' alt='@XRasher'>`
+     - `@XRasher <https://github.com/XRasher>`_
+     - 1
+   * - :raw-html-m2r:`<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
+   * - :raw-html-m2r:`<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
+   * - :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://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-09-01.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -0,0 +1,127 @@
+
+Changelog
+=========
+
+`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)
+-------------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** remove ``python*-pip`` installation (\ `d999597 <https://github.com/saltstack-formulas/postgres-formula/commit/d999597>`_\ )
+* **kitchen+travis:** modify matrix to include ``develop`` platform (\ `3f81439 <https://github.com/saltstack-formulas/postgres-formula/commit/3f81439>`_\ )
+
+Features
+^^^^^^^^
+
+
+* **debian:** add buster support (\ `904ba27 <https://github.com/saltstack-formulas/postgres-formula/commit/904ba27>`_\ )
+
+`0.37.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4>`_ (2019-05-31)
+-------------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **travis:** reduce matrix down to 6 instances (\ `2ff919f <https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f>`_\ )
+
+Tests
+^^^^^
+
+
+* **\ ``services_spec``\ :** remove temporary ``suse`` conditional (\ `81165fc <https://github.com/saltstack-formulas/postgres-formula/commit/81165fc>`_\ )
+* **command_spec:** use cleaner ``match`` string using ``%r`` (\ `a054cea <https://github.com/saltstack-formulas/postgres-formula/commit/a054cea>`_\ )
+* **locale:** improve test using locale ``en_US.UTF-8`` (\ `7796064 <https://github.com/saltstack-formulas/postgres-formula/commit/7796064>`_\ )
+
+`0.37.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3>`_ (2019-05-16)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **freebsd-user:** fix FreeBSD daemon's user for PostgreSQL >= 9.6 (\ `8745365 <https://github.com/saltstack-formulas/postgres-formula/commit/8745365>`_\ ), closes `#263 <https://github.com/saltstack-formulas/postgres-formula/issues/263>`_
+
+`0.37.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.1...v0.37.2>`_ (2019-05-12)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **sysrc-svc:** workaround *BSD minion indefinitely hanging on start (\ `0aa8b4a <https://github.com/saltstack-formulas/postgres-formula/commit/0aa8b4a>`_\ )
+
+`0.37.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.0...v0.37.1>`_ (2019-05-06)
+-------------------------------------------------------------------------------------------------------------
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **readme:** fix link for Travis badge (\ `850ca6a <https://github.com/saltstack-formulas/postgres-formula/commit/850ca6a>`_\ )
+
+`0.37.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.36.0...v0.37.0>`_ (2019-05-06)
+-------------------------------------------------------------------------------------------------------------
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** prefer ``kitchen.yml`` to ``.kitchen.yml`` (\ `8f7cbde <https://github.com/saltstack-formulas/postgres-formula/commit/8f7cbde>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **gemfile:** prepare for ``inspec`` testing (\ `157e169 <https://github.com/saltstack-formulas/postgres-formula/commit/157e169>`_\ )
+* **kitchen:** use pre-salted images as used in ``template-formula`` (\ `611ec11 <https://github.com/saltstack-formulas/postgres-formula/commit/611ec11>`_\ )
+* **kitchen+travis:** use newly available pre-salted images (\ `7b7aadc <https://github.com/saltstack-formulas/postgres-formula/commit/7b7aadc>`_\ )
+* **pillar_from_files:** use custom pillar based on ``pillar.example`` (\ `c64d9e4 <https://github.com/saltstack-formulas/postgres-formula/commit/c64d9e4>`_\ )
+* **travis:** add ``.travis.yml`` based on ``template-formula`` (\ `6467df7 <https://github.com/saltstack-formulas/postgres-formula/commit/6467df7>`_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **readme:** update ``Testing`` section for ``inspec`` (\ `4cfde8d <https://github.com/saltstack-formulas/postgres-formula/commit/4cfde8d>`_\ )
+
+Features
+^^^^^^^^
+
+
+* implement ``semantic-release`` (\ `7d3aa19 <https://github.com/saltstack-formulas/postgres-formula/commit/7d3aa19>`_\ )
+
+Tests
+^^^^^
+
+
+* **inspec:** add tests for multiple ports and postgres versions (\ `bf6a653 <https://github.com/saltstack-formulas/postgres-formula/commit/bf6a653>`_\ )
+* **inspec:** enable ``use_upstream_repo`` for ``debian`` & ``centos-6`` (\ `49fdd33 <https://github.com/saltstack-formulas/postgres-formula/commit/49fdd33>`_\ )
+* **inspec:** replace ``serverspec`` with ``inspec`` tests (\ `58ac122 <https://github.com/saltstack-formulas/postgres-formula/commit/58ac122>`_\ )
+* **inspec:** use relaxed command output match for the time being (\ `3c53684 <https://github.com/saltstack-formulas/postgres-formula/commit/3c53684>`_\ )
--- a/docs/CONTRIBUTING.rst
+++ b/docs/CONTRIBUTING.rst
@@ -0,0 +1,159 @@
+.. _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
@@ -1,42 +1,74 @@
-========
-postgres
-========
+.. _readme:

-.. note::
-
-    See the full `Salt Formulas installation and usage instructions
-    <http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_.
-
-Available states
+postgres-formula
 ================

+|img_travis| |img_sr|
+
+.. |img_travis| image:: https://travis-ci.com/saltstack-formulas/postgres-formula.svg?branch=master
+   :alt: Travis CI Build Status
+   :scale: 100%
+   :target: https://travis-ci.com/saltstack-formulas/postgres-formula
+.. |img_sr| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
+   :alt: Semantic Release
+   :scale: 100%
+   :target: https://github.com/semantic-release/semantic-release
+
+A formula to install and configure PostgreSQL server.
+
+.. contents:: **Table of Contents**
+
+General notes
+-------------
+
+See the full `SaltStack Formulas installation and usage instructions
+<https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_.
+
+If you are interested in writing or contributing to formulas, please pay attention to the `Writing Formula Section
+<https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#writing-formulas>`_.
+
+If you want to use this formula, please pay attention to the ``FORMULA`` file and/or ``git tag``,
+which contains the currently released version. This formula is versioned according to `Semantic Versioning <http://semver.org/>`_.
+
+See `Formula Versioning Section <https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#versioning>`_ for more details.
+
+Contributing to this repo
+-------------------------
+
+**Commit message formatting is significant!!**
+
+Please see :ref:`How to contribute <CONTRIBUTING>` for more details.
+
+Available states
+----------------
+
 .. contents::
-    :local:
+   :local:

 ``postgres``
------------
+^^^^^^^^^^^^

 Installs and configures both PostgreSQL server and client with creation of various DB objects in
 the cluster. This state applies to both Linux and MacOS.

 ``postgres.client``
-------------------
+^^^^^^^^^^^^^^^^^^^

 Installs the PostgreSQL client binaries and libraries on Linux.

 ``postgres.manage``
-------------------
+^^^^^^^^^^^^^^^^^^^

 Creates such DB objects as: users, tablespaces, databases, schemas and extensions.
 See ``pillar.example`` file for details.

 ``postgres.python``
----------------------
+^^^^^^^^^^^^^^^^^^^^^^

 Installs the PostgreSQL adapter for Python on Linux.

 ``postgres.server``
-------------------
+^^^^^^^^^^^^^^^^^^^

 Installs the PostgreSQL server package on Linux, prepares the DB cluster and starts the server using
 packaged init script, job or unit.
@@ -52,7 +84,7 @@ packaged init script, job or unit.


 ``postgres.server.image``
-------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^

 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:
@@ -78,7 +110,7 @@ If a lookup dictionary or Pillar has ``postgres:bake_image`` set ``False`` (this
 equivalent of applying ``postgres.server`` state.

 ``postgres.upstream``
---------------------
+^^^^^^^^^^^^^^^^^^^^^

 Configures the PostgreSQL Official (upstream) repository on target system if
 applicable.
@@ -95,53 +127,57 @@ installed from the upstream Linux repository. Defaults to ``9.5``.


 Removal states
-===============
+--------------

 ``postgres.dropped``
--------------------
+^^^^^^^^^^^^^^^^^^^^

 Meta state to remove Postgres software. By default the release installed by formula is targeted only. To target multiple releases, set pillar ``postgres.remove.multiple_releases: True``.

 ``postgres.server.remove``
------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^

 Remove server, lib, and contrib packages. The ``postgres.server.remove`` will retain data by default (no data loss) - set pillar ``postgres.remove.data: True`` to remove data and configuration directories also.

 ``postgres.client.remove``
------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^

 Remove client package.

 ``postgres.dev.remove``
----------------------
+^^^^^^^^^^^^^^^^^^^^^^

 Remove development and python packages.


 Testing
-=======
-The ``postgres`` state was tested on MacOS (El Capitan 10.11.6), and ``remove`` states on Ubuntu, Centos, and Fedora.
+-------

-Linux testing is done with the ``kitchen-salt``.
+Linux testing is done with ``kitchen-salt``.

 ``kitchen converge``
--------------------
+^^^^^^^^^^^^^^^^^^^^

-Runs the ``postgres`` main state.
+Creates the docker instance and runs the ``postgres`` main state, ready for testing.

 ``kitchen verify``
------------------
+^^^^^^^^^^^^^^^^^^

-Runs ``serverspec`` tests on the actual instance.
+Runs the ``inspec`` tests on the actual instance.
+
+``kitchen destroy``
+^^^^^^^^^^^^^^^^
+
+Removes the docker instance.

 ``kitchen test``
----------------
+^^^^^^^^^^^^^^^^

-Builds and runs tests from scratch.
+Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``verify`` + ``destroy``.

 ``kitchen login``
-----------------
+^^^^^^^^^^^^^^^^^

-Gives you ssh to the vagrant machine for manual testing.
+Gives you SSH access to the instance for manual testing.

 .. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et
--- a/docs/TOFS_pattern.rst
+++ b/docs/TOFS_pattern.rst
@@ -0,0 +1,518 @@
+.. _tofs_pattern:
+
+TOFS: A pattern for using SaltStack
+===================================
+
+.. list-table::
+   :name: tofs-authors
+   :header-rows: 1
+   :stub-columns: 1
+   :widths: 2,2,3,2
+
+   * -
+     - Person
+     - Contact
+     - Date
+   * - Authored by
+     - Roberto Moreda
+     - moreda@allenta.com
+     - 29/12/2014
+   * - Modified by
+     - Daniel Dehennin
+     - daniel.dehennin@baby-gnu.org
+     - 07/02/2019
+   * - Modified by
+     - Imran Iqbal
+     - https://github.com/myii
+     - 23/02/2019
+
+All that follows is a proposal based on my experience with `SaltStack <http://www.saltstack.com/>`_. The good thing of a piece of software like this is that you can "bend it" to suit your needs in many possible ways, and this is one of them. All the recommendations and thoughts are given "as it is" with no warranty of any type.
+
+.. contents:: **Table of Contents**
+
+Usage of values in pillar vs templates in ``file_roots``
+--------------------------------------------------------
+
+Among other functions, the *master* (or *salt-master*) serves files to the *minions* (or *salt-minions*). The `file_roots <http://docs.saltstack.com/en/latest/ref/file_server/file_roots.html>`_ is the list of directories used in sequence to find a file when a minion requires it: the first match is served to the minion. Those files could be `state files <http://docs.saltstack.com/en/latest/topics/tutorials/starting_states.html>`_ or configuration templates, among others.
+
+Using SaltStack is a simple and effective way to implement configuration management, but even in a `non-multitenant <http://en.wikipedia.org/wiki/Multitenancy>`_ scenario, it is not a good idea to generally access some data (e.g. the database password in our `Zabbix <http://www.zabbix.com/>`_ server configuration file or the private key of our `Nginx <http://nginx.org/en/>`_ TLS certificate).
+
+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/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.
+
+On the reusability of SaltStack state files
+-------------------------------------------
+
+There is a brilliant initiative of the SaltStack community called `salt-formulas <https://github.com/saltstack-formulas>`_. Their goal is to provide state files, pillar examples and configuration templates ready to be used for provisioning. I am a contributor for two small ones: `zabbix-formula <https://github.com/saltstack-formulas/zabbix-formula>`_ and `varnish-formula <https://github.com/saltstack-formulas/varnish-formula>`_.
+
+The `design guidelines <http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_ for formulas are clear in many aspects and it is a recommended reading for anyone willing to write state files, even non-formulaic ones.
+
+In the next section, I am going to describe my proposal to extend further the reusability of formulas, suggesting some patterns of usage.
+
+The Template Override and Files Switch (TOFS) pattern
+-----------------------------------------------------
+
+I understand a formula as a **complete, independent set of SaltStack state and configuration template files sufficient to configure a system**. A system could be something as simple as an NTP server or some other much more complex service that requires many state and configuration template files.
+
+The customization of a formula should be done mainly by providing pillar data used later to render either the state or the configuration template files.
+
+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::
+
+   /srv/saltstack/salt-formulas/ntp-saltstack-formula/
+     ntp/
+       map.jinja
+       init.sls
+       conf.sls
+       files/
+         default/
+           etc/
+             ntp.conf.jinja
+
+In order to use it, let's assume a `masterless configuration <http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html>`_ and this relevant section of ``/etc/salt/minion``:
+
+.. code-block:: yaml
+
+   pillar_roots:
+     base:
+       - /srv/saltstack/pillar
+   file_client: local
+   file_roots:
+     base:
+       - /srv/saltstack/salt
+       - /srv/saltstack/salt-formulas/ntp-saltstack-formula
+
+.. code-block:: jinja
+
+   {#- /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/map.jinja #}
+   {%- set ntp = salt['grains.filter_by']({
+     'default': {
+       'pkg': 'ntp',
+       'service': 'ntp',
+       'config': '/etc/ntp.conf',
+     },
+   }, merge=salt['pillar.get']('ntp:lookup')) %}
+
+In ``init.sls`` we have the minimal states required to have NTP configured. In many cases ``init.sls`` is almost equivalent to an ``apt-get install`` or a ``yum install`` of the package.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/init.sls
+   {%- from 'ntp/map.jinja' import ntp with context %}
+
+   Install NTP:
+     pkg.installed:
+       - name: {{ ntp.pkg }}
+
+   Enable and start NTP:
+     service.running:
+       - name: {{ ntp.service }}
+       - enabled: True
+       - require:
+         - pkg: Install NTP package
+
+In ``conf.sls`` we have the configuration states. In most cases, that is just managing configuration file templates and making them to be watched by the service.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
+   include:
+     - ntp
+
+   {%- from 'ntp/map.jinja' import ntp with context %}
+
+   Configure NTP:
+     file.managed:
+       - name: {{ ntp.config }}
+       - template: jinja
+       - source: salt://ntp/files/default/etc/ntp.conf.jinja
+       - watch_in:
+         - service: Enable and start NTP service
+       - require:
+         - pkg: Install NTP package
+
+Under ``files/default``, there is a structure that mimics the one in the minion in order to avoid clashes and confusion on where to put the needed templates. There you can find a mostly standard template for the configuration file.
+
+.. code-block:: jinja
+
+   {#- /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/default/etc/ntp.conf.jinja #}
+   {#- Managed by saltstack #}
+   {#- Edit pillars or override this template in saltstack if you need customization #}
+   {%- set settings = salt['pillar.get']('ntp', {}) %}
+   {%- set default_servers = ['0.ubuntu.pool.ntp.org',
+                             '1.ubuntu.pool.ntp.org',
+                             '2.ubuntu.pool.ntp.org',
+                             '3.ubuntu.pool.ntp.org'] %}
+
+   driftfile /var/lib/ntp/ntp.drift
+   statistics loopstats peerstats clockstats
+   filegen loopstats file loopstats type day enable
+   filegen peerstats file peerstats type day enable
+   filegen clockstats file clockstats type day enable
+
+   {%- for server in settings.get('servers', default_servers) %}
+   server {{ server }}
+   {%- endfor %}
+
+   restrict -4 default kod notrap nomodify nopeer noquery
+   restrict -6 default kod notrap nomodify nopeer noquery
+
+   restrict 127.0.0.1
+   restrict ::1
+
+With all this, it is easy to install and configure a simple NTP server by just running ``salt-call state.sls ntp.conf``: the package will be installed, the service will be running and the configuration should be correct for most of cases, even without pillar data.
+
+Alternatively, you can define a highstate in ``/srv/saltstack/salt/top.sls`` and run ``salt-call state.highstate``.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/salt/top.sls
+   base:
+     '*':
+       - ntp.conf
+
+**Customizing the formula just with pillar data**, we have the option to define the NTP servers.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/pillar/top.sls
+   base:
+     '*':
+       - ntp
+
+.. code-block:: sls
+
+   ## /srv/saltstack/pillar/ntp.sls
+   ntp:
+     servers:
+       - 0.ch.pool.ntp.org
+       - 1.ch.pool.ntp.org
+       - 2.ch.pool.ntp.org
+       - 3.ch.pool.ntp.org
+
+Template Override
+^^^^^^^^^^^^^^^^^
+
+If the customization based on pillar data is not enough, we can override the template by creating a new one in ``/srv/saltstack/salt/ntp/files/default/etc/ntp.conf.jinja``
+
+.. code-block:: jinja
+
+   {#- /srv/saltstack/salt/ntp/files/default/etc/ntp.conf.jinja #}
+   {#- Managed by saltstack #}
+   {#- Edit pillars or override this template in saltstack if you need customization #}
+
+   {#- Some bizarre configurations here #}
+   {#- ... #}
+
+   {%- for server in settings.get('servers', default_servers) %}
+   server {{ server }}
+   {%- endfor %}
+
+This way we are locally **overriding the template files** offered by the formula in order to make a more complex adaptation. Of course, this could be applied as well to any of the files, including the state files.
+
+Files Switch
+^^^^^^^^^^^^
+
+To bring some order into the set of template files included in a formula, as we commented, we suggest having a similar structure to a normal final file system under ``files/default``.
+
+We can make different templates coexist for different minions, classified by any `grain <http://docs.saltstack.com/en/latest/topics/targeting/grains.html>`_ value, by simply creating new directories under ``files``. This mechanism is based on **using values of some grains as a switch for the directories under** ``files/``.
+
+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::
+
+   /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/
+     default/
+       etc/
+         ntp.conf.jinja
+     RedHat/
+       etc/
+         ntp.conf.jinja
+     Debian/
+       etc/
+         ntp.conf.jinja
+
+To make this work we need a ``conf.sls`` state file that takes a list of possible files as the configuration template.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
+   include:
+     - ntp
+
+   {%- from 'ntp/map.jinja' import ntp with context %}
+
+   Configure NTP:
+     file.managed:
+       - name: {{ ntp.config }}
+       - template: jinja
+       - source:
+         - salt://ntp/files/{{ grains.get('os_family', 'default') }}/etc/ntp.conf.jinja
+         - salt://ntp/files/default/etc/ntp.conf.jinja
+       - watch_in:
+         - service: Enable and start NTP service
+       - require:
+         - pkg: Install NTP package
+
+If we want to cover the possibility of a special template for a minion identified by ``node01`` then we could have a specific template in ``/srv/saltstack/salt/ntp/files/node01/etc/ntp.conf.jinja``.
+
+.. code-block:: jinja
+
+   {#- /srv/saltstack/salt/ntp/files/node01/etc/ntp.conf.jinja #}
+   {#- Managed by saltstack #}
+   {#- Edit pillars or override this template in saltstack if you need customization #}
+
+   {#- Some crazy configurations here for node01 #}
+   {#- ... #}
+
+To make this work we could write a specially crafted ``conf.sls``.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
+   include:
+     - ntp
+
+   {%- from 'ntp/map.jinja' import ntp with context %}
+
+   Configure NTP:
+     file.managed:
+       - name: {{ ntp.config }}
+       - template: jinja
+       - source:
+         - salt://ntp/files/{{ grains.get('id') }}/etc/ntp.conf.jinja
+         - salt://ntp/files/{{ grains.get('os_family') }}/etc/ntp.conf.jinja
+         - salt://ntp/files/default/etc/ntp.conf.jinja
+       - watch_in:
+         - service: Enable and start NTP service
+       - require:
+         - pkg: Install NTP package
+
+Using the ``files_switch`` macro
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We can simplify the ``conf.sls`` with the new ``files_switch`` macro to use in the ``source`` parameter for the ``file.managed`` state.
+
+.. code-block:: sls
+
+   ## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
+   include:
+     - ntp
+
+   {%- set tplroot = tpldir.split('/')[0] %}
+   {%- from 'ntp/map.jinja' import ntp with context %}
+   {%- from 'ntp/libtofs.jinja' import files_switch %}
+
+   Configure NTP:
+     file.managed:
+       - name: {{ ntp.config }}
+       - template: jinja
+       - source: {{ files_switch(['/etc/ntp.conf.jinja'],
+                                 lookup='Configure NTP'
+                    )
+                 }}
+       - watch_in:
+         - service: Enable and start NTP service
+       - require:
+         - pkg: Install NTP package
+
+
+* 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``.
+
+.. literalinclude:: ../template/libtofs.jinja
+   :caption: /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/libtofs.jinja
+   :language: jinja
+
+How to customise the ``source`` further
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The examples below are based on an ``Ubuntu`` minion called ``theminion`` being configured via. pillar.
+
+Using the default settings of the ``files_switch`` macro above,
+the ``source`` will be:
+
+.. code-block:: sls
+
+         - source:
+           - salt://ntp/files/theminion/etc/ntp.conf.jinja
+           - salt://ntp/files/Debian/etc/ntp.conf.jinja
+           - salt://ntp/files/default/etc/ntp.conf.jinja
+
+Customise ``files``
+~~~~~~~~~~~~~~~~~~~
+
+The ``files`` portion can be customised:
+
+.. code-block:: sls
+
+   ntp:
+     tofs:
+       dirs:
+         files: files_alt
+
+Resulting in:
+
+.. code-block:: sls
+
+         - source:
+           - salt://ntp/files_alt/theminion/etc/ntp.conf.jinja
+           - salt://ntp/files_alt/Debian/etc/ntp.conf.jinja
+           - salt://ntp/files_alt/default/etc/ntp.conf.jinja
+
+Customise the use of grains
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Grains can be customised and even arbitrary paths can be supplied:
+
+.. code-block:: sls
+
+   ntp:
+     tofs:
+       files_switch:
+         - any/path/can/be/used/here
+         - id
+         - os
+         - os_family
+
+Resulting in:
+
+.. code-block:: sls
+
+         - source:
+           - salt://ntp/files/any/path/can/be/used/here/etc/ntp.conf.jinja
+           - salt://ntp/files/theminion/etc/ntp.conf.jinja
+           - salt://ntp/files/Ubuntu/etc/ntp.conf.jinja
+           - salt://ntp/files/Debian/etc/ntp.conf.jinja
+           - salt://ntp/files/default/etc/ntp.conf.jinja
+
+Customise the ``default`` path
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``default`` portion of the path can be customised:
+
+.. code-block:: sls
+
+   ntp:
+     tofs:
+       dirs:
+         default: default_alt
+
+Resulting in:
+
+.. code-block:: sls
+
+         - source:
+           ...
+           - salt://ntp/files/default_alt/etc/ntp.conf.jinja
+
+Customise the list of ``source_files``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The list of ``source_files`` can be given:
+
+.. code-block:: sls
+
+   ntp:
+     tofs:
+       source_files:
+         Configure NTP:
+           - '/etc/ntp.conf_alt.jinja'
+
+Resulting in:
+
+.. code-block:: sls
+
+         - source:
+           - salt://ntp/files/theminion/etc/ntp.conf_alt.jinja
+           - salt://ntp/files/theminion/etc/ntp.conf.jinja
+           - salt://ntp/files/Debian/etc/ntp.conf_alt.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::
+
+   /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.yml
+++ b/kitchen.yml
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+# For help on this file's format, see https://kitchen.ci/
+driver:
+  name: docker
+  use_sudo: false
+  privileged: true
+  run_command: /lib/systemd/systemd
+
+# Make sure the platforms listed below match up with
+# the `env.matrix` instances defined in `.travis.yml`
+platforms:
+  ## SALT `develop`
+  - name: debian-10-develop-py3
+    driver:
+      image: netmanagers/salt-develop-py3:debian-10
+      provision_command:
+        - 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
+      provision_command:
+        - 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
+      provision_command:
+        - 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
+      provision_command:
+        - 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
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+      run_command: /usr/lib/systemd/systemd
+  - name: amazonlinux-2-develop-py2
+    driver:
+      image: netmanagers/salt-develop-py2:amazonlinux-2
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
+
+  ## SALT `2019.2`
+  - name: debian-9-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:debian-9
+  - name: ubuntu-1804-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:ubuntu-18.04
+  - name: centos-7-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:centos-7
+  - name: fedora-30-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:fedora-30
+  - name: opensuse-leap-15-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:opensuse-leap-15
+      run_command: /usr/lib/systemd/systemd
+  - name: amazonlinux-2-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:amazonlinux-2
+
+  ## 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: netmanagers/salt-2018.3-py2:opensuse-leap-15
+      run_command: /usr/lib/systemd/systemd
+  - name: amazonlinux-2-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:amazonlinux-2
+
+  ## 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: netmanagers/salt-2017.7-py2:opensuse-leap-15
+      run_command: /usr/lib/systemd/systemd
+  - name: amazonlinux-2-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:amazonlinux-2
+
+provisioner:
+  name: salt_solo
+  log_level: info
+  salt_install: none
+  require_chef: false
+  formula: postgres
+  salt_copy_filter:
+    - .kitchen
+    - .git
+
+verifier:
+  # https://www.inspec.io/
+  name: inspec
+  sudo: true
+  # cli, documentation, html, progress, json, json-min, json-rspec, junit
+  reporter:
+    - cli
+
+suites:
+  - name: default
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - postgres
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - postgres
+      pillars_from_files:
+        postgres.sls: test/salt/pillar/postgres.sls
+    verifier:
+      inspec_tests:
+        - path: test/integration/default
--- a/pillar.example
+++ b/pillar.example
@@ -1,30 +1,36 @@
+# -*- 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
-  use_upstream_repo: False
-  # Version to install from upstream repository (if upstream_repo: True)
+  # Set true to configure upstream postgresql.org repository for YUM/APT/ZYPP
+  use_upstream_repo: false
+  # 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: 'homebrew'
+  # use_upstream_repo: 'postgresapp'
+  # use_upstream_repo: 'homebrew'

  # PACKAGE
  # These pillars are typically never required.
  # pkg: 'postgresql'
  # pkg_client: 'postgresql-client'
-  # service: postgresql
+  # service:
+  #   name: 'postgresql'
+  #   flags: -w -s -m fast
+  #   sysrc: true
  pkgs_extra:
    - postgresql-contrib
    - postgresql-plpython
@@ -33,10 +39,10 @@ postgres:
  # The default `encoding` is derived from the `locale` so not recommended
  # to provide a value for it unless necessary
  cluster:
-    locale: en_GB.UTF-8
+    locale: en_US.UTF-8
    # encoding: UTF8

-  #'Alternatives system' priority incremental. 0 disables feature.
+  # 'Alternatives system' priority incremental. 0 disables feature.
  linux:
    altpriority: 30

@@ -59,7 +65,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']
@@ -80,7 +86,7 @@ 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 %}
@@ -90,9 +96,9 @@ postgres:
  # 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 %}

@@ -103,7 +109,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
@@ -114,13 +120,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
@@ -128,18 +134,18 @@ postgres:
    localUser:
      ensure: present
      password: '98ruj923h4rf'
-      createdb: False
-      createroles: False
-      inherit: True
-      replication: False
+      createdb: false
+      createroles: false
+      inherit: true
+      replication: false

    remoteUser:
      ensure: present
      password: '98ruj923h4rf'
-      createdb: False
-      createroles: False
-      inherit: True
-      replication: False
+      createdb: false
+      createroles: false
+      inherit: true
+      replication: false

    absentUser:
      ensure: absent
@@ -180,14 +186,14 @@ postgres:

  # optional extensions to install in schema
  extensions:
+    # postgis: {}
    uuid-ossp:
      schema: uuid-ossp
      maintenance_db: db1
-    #postgis: {}

  remove:
-    data: True
-    multiple_releases: True
-    releases: ['9.6', '10',]
+    data: true
+    multiple_releases: true
+    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 %}
@@ -50,16 +53,18 @@

 {% endmacro %}

-## Debian GNU/Linux
+## Debian GNU/Linux (the second parameter refers to the postgresql package version, not the distro)
 {{ debian_codename('wheezy', '9.1') }}
 {{ 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') }}
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -1,8 +1,11 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
 # Default lookup dictionary

 postgres:
-  use_upstream_repo: True
-  add_profile: False # add bin_dir to $PATH, if installed from repos
+  use_upstream_repo: true
+  add_profile: false  # add bin_dir to $PATH, if installed from repos
  version: '10'
  pkg: postgresql
  pkgs_extra: []
@@ -17,7 +20,7 @@ postgres:
  group: postgres

  prepare_cluster:
-    run: True
+    run: true
    pgcommand: initdb -D
    pgtestfile: PG_VERSION
    user: postgres
@@ -37,7 +40,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:
@@ -67,9 +71,11 @@ postgres:

  config_backup: '.bak'

-  service: postgresql
+  service:
+    name: postgresql
+    sysrc: false

-  bake_image: False
+  bake_image: false

  fromrepo: ''

@@ -80,10 +86,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
-    multiple_releases: False
-    releases: ['9.2', '9.3', '9.4', '9.5', '9.6', '10',]
+    data: false
+    multiple_releases: false
+    releases: ['9.2', '9.3', '9.4', '9.5', '9.6', '10']
--- a/postgres/libtofs.jinja
+++ b/postgres/libtofs.jinja
@@ -0,0 +1,112 @@
+{%- macro files_switch(source_files,
+                       lookup=None,
+                       default_files_switch=['id', 'os_family'],
+                       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 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
+        use as selector switch of the directories under
+        "<path_prefix>/files"
+      * indent_witdh: indentation of the result value to conform to YAML
+      * use_subpath: defaults to `False` but if set, lookup the source file
+        recursively from the current state directory up to `tplroot`
+
+    Example (based on a `tplroot` of `xxx`):
+
+    If we have a state:
+
+      Deploy configuration:
+        file.managed:
+          - name: /etc/yyy/zzz.conf
+          - source: {{ files_switch(['/etc/yyy/zzz.conf', '/etc/yyy/zzz.conf.jinja'],
+                                    lookup='Deploy configuration'
+                    ) }}
+          - 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
+          - source:
+            - salt://xxx/files/theminion/etc/yyy/zzz.conf
+            - salt://xxx/files/theminion/etc/yyy/zzz.conf.jinja
+            - salt://xxx/files/RedHat/etc/yyy/zzz.conf
+            - salt://xxx/files/RedHat/etc/yyy/zzz.conf.jinja
+            - salt://xxx/files/default/etc/yyy/zzz.conf
+            - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
+          - template: jinja
+  #}
+  {#- Get the `tplroot` from `tpldir` #}
+  {%- set tplroot = tpldir.split('/')[0] %}
+  {%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %}
+  {%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %}
+  {%- set files_switch_list = salt['config.get'](
+      tplroot ~ ':tofs:files_switch',
+      default_files_switch
+  ) %}
+  {#- Lookup source_files (v2), files (v1), or fallback to an empty list #}
+  {%- set src_files = salt['config.get'](
+      tplroot ~ ':tofs:source_files:' ~ lookup,
+      salt['config.get'](tplroot ~ ':tofs:files:' ~ lookup, [])
+  ) %}
+  {#- Append the default source_files #}
+  {%- set src_files = src_files + source_files %}
+  {#- Only add to [''] when supporting older TOFS implementations #}
+  {%- set path_prefix_exts = [''] %}
+  {%- if use_subpath and tplroot != tpldir %}
+    {#- Walk directory tree to find {{ files_dir }} #}
+    {%- set subpath_parts = tpldir.lstrip(tplroot).lstrip('/').split('/') %}
+    {%- for path in subpath_parts %}
+      {%- set subpath = subpath_parts[0:loop.index] | join('/') %}
+      {%- do path_prefix_exts.append('/' ~ subpath) %}
+    {%- endfor %}
+  {%- endif %}
+  {%- for path_prefix_ext in path_prefix_exts|reverse %}
+    {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
+    {#- For older TOFS implementation, use `files_switch` from the config #}
+    {#- Use the default, new method otherwise #}
+    {%- set fsl = salt['config.get'](
+        tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch',
+        files_switch_list
+    ) %}
+    {#- Append 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 %}
+{%- endmacro %}
--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
 {% import_yaml "postgres/repo.yaml" as repo %}

 {% set release = repo.version|replace('.', '') %}
@@ -21,20 +24,33 @@ Debian:
    {% endif %}

 FreeBSD:
-  conf_dir: /usr/local/pgsql/data
-  data_dir: /usr/local/pgsql/data
+    {% if repo.version|float >= 9.6 %}
+  user: &freebsd-user postgres
+  group: &freebsd-group postgres
+  conf_dir: {{ '/var/db/postgres/data' ~ release  }}
+  data_dir: {{ '/var/db/postgres/data' ~ release }}
+    {% else %}
  user: &freebsd-user pgsql
  group: &freebsd-group pgsql
+  conf_dir: /usr/local/pgsql/data
+  data_dir: /usr/local/pgsql/data
+    {% endif %}
  pkg_client: postgresql{{ release }}-client
  pkg: postgresql{{ release }}-server
  prepare_cluster:
    user: *freebsd-user
    group: *freebsd-group
+  service:
+    flags: -w -s -m fast
+    sysrc: True

 OpenBSD:
  conf_dir: /var/postgresql/data
  data_dir: /var/postgresql/data
  user: _postgresql
+  service:
+    flags: -w -s -m fast
+    sysrc: True

 RedHat:
  pkg_repo:
@@ -54,7 +70,8 @@ RedHat:
  pkg_dev: postgresql{{ release }}-devel
  conf_dir: {{ data_dir }}
  data_dir: {{ data_dir }}
-  service: postgresql-{{ repo.version }}
+  service:
+    name: postgresql-{{ repo.version }}

  # Alternatives system
  linux:
@@ -132,7 +149,8 @@ Suse:
  pkg_libs: postgresql{{ release }}-libs
  conf_dir: {{ data_dir }}
  data_dir: {{ data_dir }}
-  service: postgresql-{{ repo.version }}
+  service:
+    name: postgresql-{{ repo.version }}

  # Alternatives system
  linux:
@@ -175,9 +193,11 @@ Suse:
 ## jinja check avoids rendering noise/failure on Linux
 MacOS:
   {%- if repo.use_upstream_repo == 'homebrew' %}
-  service: homebrew.mxcl.postgresql
+  service:
+    name: homebrew.mxcl.postgresql
   {%- elif repo.use_upstream_repo == 'postgresapp' %}
-  service: com.postgresapp.Postgres2
+  service:
+    name: com.postgresapp.Postgres2
   {%- endif %}
  pkg: postgresql
  pkg_client:
--- 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',]
-
-# vim: ft=sls
+    releases: ['9.4', '9.5', '9.6', '10']
--- 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
@@ -24,11 +24,11 @@ postgresql-start:
 postgresql-enable:
  cmd.run:
  {%- if salt['file.file_exists']('/bin/systemctl') %}
-    - name: systemctl enable {{ postgres.service }}
+    - name: systemctl enable {{ postgres.service.name }}
  {%- elif salt['cmd.which']('chkconfig') %}
-    - name: chkconfig {{ postgres.service }} on
+    - name: chkconfig {{ postgres.service.name }} on
  {%- elif salt['file.file_exists']('/usr/sbin/update-rc.d') %}
-    - name: update-rc.d {{ service }} defaults
+    - name: update-rc.d {{ postgres.service.name }} defaults
  {%- else %}
    # Nothing to do
    - name: 'true'
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -31,8 +31,8 @@ postgresql-server:
    - require_in:
      - file: postgresql-server
  file.managed:
-    - name: /Library/LaunchAgents/{{ postgres.service }}.plist
-    - source: /usr/local/opt/postgres/{{ postgres.service }}.plist
+    - name: /Library/LaunchAgents/{{ postgres.service.name }}.plist
+    - source: /usr/local/opt/postgres/{{ postgres.service.name }}.plist
    - group: wheel
    - require_in:
      - service: postgresql-running
@@ -261,12 +261,23 @@ postgresql-tablespace-dir-{{ name }}-fcontext:

 {%- if not postgres.bake_image %}

+# Workaround for FreeBSD minion undefinitely hanging on service start
+# cf. https://github.com/saltstack/salt/issues/44848
+{% if postgres.service.sysrc %}
+posgresql-rc-flags:
+  sysrc.managed:
+    - name: {{ postgres.service.name }}_flags
+    - value: "{{ postgres.service.flags }} > /dev/null 2>&1"
+    - watch_in:
+      - service: postgresql-running
+{% endif %}
+
 # Start PostgreSQL server using OS init
 # Note: This is also the target for numerous `watch_in` requisites above, used
 # for the necessary service restart after changing the relevant configuration files
 postgresql-running:
  service.running:
-    - name: {{ postgres.service }}
+    - name: {{ postgres.service.name }}
    - enable: True

 # Reload the service for changes made to `pg_ident.conf`, except for `MacOS`
@@ -275,7 +286,7 @@ postgresql-running:
 postgresql-service-reload:
  module.wait:
    - name: service.reload
-    - m_name: {{ postgres.service }}
+    - m_name: {{ postgres.service.name }}
    - require:
      - service: postgresql-running
 {%- endif %}
--- a/postgres/server/remove.sls
+++ b/postgres/server/remove.sls
@@ -2,7 +2,7 @@

 postgresql-dead:
  service.dead:
-    - name: {{ postgres.service }}
+    - name: {{ postgres.service.name }}
    - enable: False

 postgresql-repo-removed:
@@ -81,7 +81,7 @@ postgresql{{ release }}-tablespace-dir-{{ name }}-removed:
  file.absent:
    - name: {{ tblspace.directory }}
    - require:
-      - file: postgresql{{ release }}-dataconf-removed 
+      - file: postgresql{{ release }}-dataconf-removed
      {% endfor %}
    {% endif %}

--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+###############################################################################
+# (A) Update `FORMULA` with `${nextRelease.version}`
+###############################################################################
+sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
+
+
+###############################################################################
+# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
+###############################################################################
+
+# Install `m2r`
+sudo -H pip install m2r
+
+# Copy and then convert the `.md` docs
+cp *.md docs/
+cd docs/
+m2r --overwrite *.md
+
+# Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
+sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
+sed -i -e '1,4s/-/=/g' CHANGELOG.rst
+
+# Use for debugging output, when required
+# cat AUTHORS.rst
+# cat CHANGELOG.rst
+
+# Return back to the main directory
+cd ..
--- a/release-rules.js
+++ b/release-rules.js
@@ -0,0 +1,18 @@
+// No release is triggered for the types commented out below.
+// Commits using these types will be incorporated into the next release.
+//
+// NOTE: Any changes here must be reflected in `CONTRIBUTING.md`.
+module.exports = [
+  {breaking: true, release: 'major'},
+  // {type: 'build', release: 'patch'},
+  // {type: 'chore', release: 'patch'},
+  // {type: 'ci', release: 'patch'},
+  {type: 'docs', release: 'patch'},
+  {type: 'feat', release: 'minor'},
+  {type: 'fix', release: 'patch'},
+  {type: 'perf', release: 'patch'},
+  {type: 'refactor', release: 'patch'},
+  {type: 'revert', release: 'patch'},
+  {type: 'style', release: 'patch'},
+  {type: 'test', release: 'patch'},
+];
--- a/release.config.js
+++ b/release.config.js
@@ -0,0 +1,106 @@
+module.exports = {
+  branch: 'master',
+  plugins: [
+      ['@semantic-release/commit-analyzer', {
+        preset: 'angular',
+        releaseRules: './release-rules.js',
+      }],
+      '@semantic-release/release-notes-generator',
+      ['@semantic-release/changelog', {
+        changelogFile: 'CHANGELOG.md',
+        changelogTitle: '# Changelog',
+      }],
+      ['@semantic-release/exec', {
+        prepareCmd: 'sh ./pre-commit_semantic-release.sh ${nextRelease.version}',
+      }],
+      ['@semantic-release/git', {
+        assets: ['*.md', 'docs/*.rst', 'FORMULA'],
+      }],
+      '@semantic-release/github',
+  ],
+  generateNotes: {
+    preset: 'angular',
+    writerOpts: {
+      // Required due to upstream bug preventing all types being displayed.
+      // Bug: https://github.com/conventional-changelog/conventional-changelog/issues/317
+      // Fix: https://github.com/conventional-changelog/conventional-changelog/pull/410
+      transform: (commit, context) => {
+          const issues = []
+
+          commit.notes.forEach(note => {
+              note.title = `BREAKING CHANGES`
+          })
+
+          // NOTE: Any changes here must be reflected in `CONTRIBUTING.md`.
+          if (commit.type === `feat`) {
+              commit.type = `Features`
+          } else if (commit.type === `fix`) {
+              commit.type = `Bug Fixes`
+          } else if (commit.type === `perf`) {
+              commit.type = `Performance Improvements`
+          } else if (commit.type === `revert`) {
+              commit.type = `Reverts`
+          } else if (commit.type === `docs`) {
+              commit.type = `Documentation`
+          } else if (commit.type === `style`) {
+              commit.type = `Styles`
+          } else if (commit.type === `refactor`) {
+              commit.type = `Code Refactoring`
+          } else if (commit.type === `test`) {
+              commit.type = `Tests`
+          } else if (commit.type === `build`) {
+              commit.type = `Build System`
+          // } else if (commit.type === `chore`) {
+          //     commit.type = `Maintenance`
+          } else if (commit.type === `ci`) {
+              commit.type = `Continuous Integration`
+          } else {
+              return
+          }
+
+          if (commit.scope === `*`) {
+              commit.scope = ``
+          }
+
+          if (typeof commit.hash === `string`) {
+              commit.hash = commit.hash.substring(0, 7)
+          }
+
+          if (typeof commit.subject === `string`) {
+              let url = context.repository
+                  ? `${context.host}/${context.owner}/${context.repository}`
+                  : context.repoUrl
+              if (url) {
+                  url = `${url}/issues/`
+                  // Issue URLs.
+                  commit.subject = commit.subject.replace(/#([0-9]+)/g, (_, issue) => {
+                      issues.push(issue)
+                      return `[#${issue}](${url}${issue})`
+                  })
+              }
+              if (context.host) {
+                  // User URLs.
+                  commit.subject = commit.subject.replace(/\B@([a-z0-9](?:-?[a-z0-9/]){0,38})/g, (_, username) => {
+                  if (username.includes('/')) {
+                      return `@${username}`
+                  }
+
+                  return `[@${username}](${context.host}/${username})`
+                  })
+              }
+          }
+
+          // remove references that already appear in the subject
+          commit.references = commit.references.filter(reference => {
+              if (issues.indexOf(reference.issue) === -1) {
+                  return true
+              }
+
+              return false
+          })
+
+          return commit
+      },
+    },
+  },
+};
--- a/test/integration/default/README.md
+++ b/test/integration/default/README.md
@@ -0,0 +1,50 @@
+# InSpec Profile: `default`
+
+This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+
+## Verify a profile
+
+InSpec ships with built-in features to verify a profile structure.
+
+```bash
+$ inspec check default
+Summary
+-------
+Location: default
+Profile: profile
+Controls: 4
+Timestamp: 2019-06-24T23:09:01+00:00
+Valid: true
+
+Errors
+------
+
+Warnings
+--------
+```
+
+## Execute a profile
+
+To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
+
+```bash
+$ inspec exec default
+..
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+8 examples, 0 failures
+```
+
+## Execute a specific control from a profile
+
+To run one control from the profile use `inspec exec /path/to/profile --controls name`.
+
+```bash
+$ inspec exec default --controls package
+.
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+1 examples, 0 failures
+```
+
+See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -0,0 +1,14 @@
+# Overide by Platform
+pg_port = '5432'
+if platform[:family] == 'debian' or 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
+    its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
+  end
+end
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config_spec.rb
@@ -0,0 +1,10 @@
+control 'Postgres configuration' do
+  title 'should include the directory'
+
+  describe file('/srv/my_tablespace') do
+    it { should be_directory }
+    it { should be_owned_by 'postgres' }
+    it { should be_grouped_into 'postgres' }
+    its('mode') { should cmp '0700' }
+  end
+end
--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -0,0 +1,22 @@
+# Overide by Platform
+service_name = 'postgresql'
+pg_port = 5432
+if platform[:name] == 'centos' and platform[:release].start_with?('6')
+  service_name = 'postgresql-9.6'
+elsif platform[:family] == 'debian' or platform[:family] == 'suse'
+  pg_port = 5433
+end
+
+control 'Postgres service' do
+  impact 0.5
+  title 'should be running and enabled'
+
+  describe service(service_name) do
+    it { should be_enabled }
+    it { should be_running }
+  end
+
+  describe port(pg_port) do
+    it { should be_listening }
+  end
+end
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+name: default
+title: postgres formula
+maintainer: SaltStack Formulas
+license: Apache-2.0
+summary: Verify that the postgres formula is setup and configured correctly
+supports:
+  - platform-name: debian
+  - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
--- a/test/integration/default/serverspec/postgres_spec.rb
+++ b/test/integration/default/serverspec/postgres_spec.rb
@@ -1,23 +0,0 @@
-require 'serverspec'
-
-set :backend, :exec
-
-describe service('postgresql') do
-  it { should be_enabled }
-  it { should be_running }
-end
-
-describe port('5432') do
-  it { should be_listening }
-end
-
-describe file('/srv/my_tablespace') do
-  it { should be_directory }
-  it { should be_mode 700 }
-  it { should be_owned_by 'postgres' }
-  it { should be_grouped_into 'postgres' }
-end
-
-describe command(%q{su - postgres -c 'psql -qtc "\l+ db2"'}) do
-        its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US\.UTF-8.*en_US\.UTF-8.*my_space/) }
-end
--- a/test/salt/pillar/postgres.sls
+++ b/test/salt/pillar/postgres.sls
@@ -0,0 +1,210 @@
+# 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') %}
+postgres.port: '5432'
+{%- else %}
+postgres.port: '5433'
+{%- endif %}
+
+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') %}
+  use_upstream_repo: False
+  {%- else %}
+  use_upstream_repo: True
+  # Version to install from upstream repository (if upstream_repo: True)
+  {%- if not (grains.os_family == 'Debian') %}
+  version: '9.6'
+  {%- else %}
+  version: '10'
+  {%- endif %}
+  # # 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
+  # # If automatic package installation fails, use `fromrepo` to specify the
+  # # upstream repo to install packages from [#133, #185] (if upstream_repo: True)
+  # fromrepo: 'jessie-pgdg'
+  {%- endif %}
+
+  # ### MACOS
+  # # Set to 'postgresapp' OR 'homebrew' for MacOS
+  # # use_upstream_repo: 'postgresapp'
+  # # use_upstream_repo: 'homebrew'
+
+  # # PACKAGE
+  # # These pillars are typically never required.
+  # # pkg: 'postgresql'
+  # # pkg_client: 'postgresql-client'
+  # # service: postgresql
+  # pkgs_extra:
+  #   - postgresql-contrib
+  #   - postgresql-plpython
+
+  # CLUSTER
+  # The default `encoding` is derived from the `locale` so not recommended
+  # to provide a value for it unless necessary
+  cluster:
+    locale: en_US.UTF-8
+    # encoding: UTF8
+
+  # #'Alternatives system' priority incremental. 0 disables feature.
+  # linux:
+  #   altpriority: 30
+  #
+  # # macos limits
+  # limits:
+  #   soft: 64000
+  #   hard: 128000
+
+  # POSTGRES
+  # Append the lines under this item to your postgresql.conf file.
+  # Pay attention to indent exactly with 4 spaces for all lines.
+  postgresconf: |-
+    listen_addresses = '*'  # listen on all interfaces
+
+  # Path to the `pg_hba.conf` file Jinja template on Salt Fileserver
+  pg_hba.conf: salt://postgres/templates/pg_hba.conf.j2
+
+  # This section covers ACL management in the ``pg_hba.conf`` file.
+  # acls list controls: which hosts are allowed to connect, how clients
+  # are authenticated, which PostgreSQL user names they can use, which
+  # databases they can access. Records take one of these forms:
+  #
+  # acls:
+  #  - ['local', 'DATABASE',  'USER',  'METHOD']
+  #  - ['host', 'DATABASE',  'USER',  'ADDRESS', 'METHOD']
+  #  - ['hostssl', 'DATABASE', 'USER', 'ADDRESS', 'METHOD']
+  #  - ['hostnossl', 'DATABASE', 'USER', 'ADDRESS', 'METHOD']
+  #
+  # The uppercase items must be replaced by actual values.
+  # METHOD could be omitted, 'md5' will be appended by default.
+  #
+  # If ``acls`` item value is empty ('', [], null), then the contents of
+  # ``pg_hba.conf`` file will not be touched at all.
+  acls:
+    - ['local', 'db0', 'connuser', 'peer map=users_as_appuser']
+    - ['local', 'db1', 'localUser']
+    - ['host', 'db2', 'remoteUser', '192.168.33.0/24']
+
+  identity_map:
+    - ['users_as_appuser', 'jdoe', 'connuser']
+    - ['users_as_appuser', 'jsmith', 'connuser']
+
+  # Backup extension for configuration files, defaults to ``.bak``.
+  # 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 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 #}
+  {# # script, job or unit run with Salt ``service`` state. #}
+  {# bake_image: True #}
+  {#  #}
+  {# {%- endif %} #}
+
+  # Create/remove users, tablespaces, databases, schema and extensions.
+  # Each of these dictionaries contains PostgreSQL entities which
+  # mapped to the ``postgres_*`` Salt states with arguments. See the Salt
+  # documentation to get all supported argument for a particular state.
+  #
+  # Format is the following:
+  #
+  #<users|tablespaces|databases|schemas|extensions>:
+  #  NAME:
+  #    ensure: <present|absent>  # 'present' is the default
+  #    ARGUMENT: VALUE
+  #    ...
+  #
+  # where 'NAME' is the state name, 'ARGUMENT' is the kwarg name, and
+  # 'VALUE' is kwarg value.
+  #
+  # For example, the Pillar:
+  #
+  # users:
+  #   testUser:
+  #     password: test
+  #
+  # will render such state:
+  #
+  # postgres_user-testUser:
+  #   postgres_user.present:
+  #     - name: testUser
+  #     - password: test
+  users:
+    localUser:
+      ensure: present
+      password: '98ruj923h4rf'
+      createdb: False
+      createroles: False
+      inherit: True
+      replication: False
+
+    remoteUser:
+      ensure: present
+      password: '98ruj923h4rf'
+      createdb: False
+      createroles: False
+      inherit: True
+      replication: False
+
+    absentUser:
+      ensure: absent
+
+  # tablespaces to be created
+  tablespaces:
+    my_space:
+      directory: /srv/my_tablespace
+      owner: localUser
+
+  # databases to be created
+  databases:
+    db1:
+      owner: localUser
+      template: template0
+      lc_ctype: en_US.UTF-8
+      lc_collate: en_US.UTF-8
+    db2:
+      owner: remoteUser
+      template: template0
+      lc_ctype: en_US.UTF-8
+      lc_collate: en_US.UTF-8
+      tablespace: my_space
+      # set custom schema
+      schemas:
+        public:
+          owner: localUser
+      # enable per-db extension
+      {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
+      extensions:
+        uuid-ossp:
+          schema: 'public'
+      {%- endif %}
+
+  # optional schemas to enable on database
+  schemas:
+    uuid-ossp:
+      dbname: db1
+      owner: localUser
+
+  # optional extensions to install in schema
+  {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
+  extensions:
+    uuid-ossp:
+      schema: uuid-ossp
+      maintenance_db: db1
+    # postgis: {}
+  {%- endif %}
+
+  # remove:
+  #   data: True
+  #   multiple_releases: True
+  #   releases: ['9.6', '10',]
+
+# vim: ft=yaml ts=2 sts=2 sw=2 et
Author	SHA1	Message	Date
semantic-release-bot	85a5dca346	chore(release): 0.39.1 [skip ci] ## [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))	2019-09-01 11:09:44 +00:00
Niels Abspoel	aa96c783bb	Merge pull request #285 from myii/chore/standardise-structure ci(kitchen+travis): replace EOL pre-salted images	2019-09-01 11:42:37 +02:00
Imran Iqbal	140928bfc2	ci(kitchen+travis): replace EOL pre-salted images * Automated using https://github.com/myii/ssf-formula/pull/16	2019-08-28 07:40:17 +01:00
Imran Iqbal	677adbae16	test(inspec): fix reference to `suse` after gem `train` update * https://github.com/inspec/train/pull/505	2019-08-28 07:39:55 +01:00
Imran Iqbal	766596e175	Merge pull request #284 from myii/chore/standardise-structure chore: use `semantic-release` cross-formula standard structure	2019-08-17 16:46:14 +01:00
Imran Iqbal	5160365a71	chore: use `semantic-release` cross-formula standard structure * Automated using `ssf-formula` (v0.6.0)	2019-08-17 16:06:31 +01:00
semantic-release-bot	e81c633b4e	chore(release): 0.39.0 [skip ci] # [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))	2019-08-17 09:19:19 +00:00
Niels Abspoel	19b6efbb33	Merge pull request #283 from myii/chore/standardise-structure feat(yamllint): include for this repo and apply rules throughout	2019-08-17 09:51:18 +02:00
Imran Iqbal	1f0fd92674	feat(yamllint): include for this repo and apply rules throughout * Semi-automated using `ssf-formula` (v0.5.0) * Fix (or ignore) errors shown below: ```bash postgres-formula$ $(grep "\- yamllint" .travis.yml \| sed -e "s:^\s\+-\s\(.*\):\1:") ./postgres/repo.yaml 4:2 error syntax error: found character '%' that cannot start any token 6:89 error line too long (110 > 88 characters) (line-length) 9:89 error line too long (95 > 88 characters) (line-length) 13:89 error line too long (104 > 88 characters) (line-length) 14:89 error line too long (106 > 88 characters) (line-length) ./postgres/defaults.yaml 3:1 warning missing document start "---" (document-start) 4:22 warning truthy value should be one of [false, true] (truthy) 5:16 warning truthy value should be one of [false, true] (truthy) 5:22 warning too few spaces before comment (comments) 20:10 warning truthy value should be one of [false, true] (truthy) 40:8 warning missing starting space in comment (comments) 41:89 error line too long (97 > 88 characters) (line-length) 71:11 error too many spaces after colon (colons) 72:12 warning truthy value should be one of [false, true] (truthy) 74:15 warning truthy value should be one of [false, true] (truthy) 85:6 warning missing starting space in comment (comments) 89:11 warning truthy value should be one of [false, true] (truthy) 90:24 warning truthy value should be one of [false, true] (truthy) 91:56 error too few spaces after comma (commas) ./postgres/codenamemap.yaml 3:2 error syntax error: found character '%' that cannot start any token 8:89 error line too long (98 > 88 characters) (line-length) 49:89 error line too long (110 > 88 characters) (line-length) 53:89 error line too long (99 > 88 characters) (line-length) ./postgres/osmap.yaml 1:2 error syntax error: found character '%' that cannot start any token 5:89 error line too long (115 > 88 characters) (line-length) ./postgres/osfamilymap.yaml 1:2 error syntax error: found character '%' that cannot start any token 57:89 error line too long (90 > 88 characters) (line-length) 58:89 error line too long (113 > 88 characters) (line-length) 134:89 error line too long (103 > 88 characters) (line-length) 135:89 error line too long (127 > 88 characters) (line-length) 205:89 error line too long (91 > 88 characters) (line-length) 206:89 error line too long (91 > 88 characters) (line-length) pillar.example 3:1 warning missing document start "---" (document-start) 8:22 warning truthy value should be one of [false, true] (truthy) 13:16 warning truthy value should be one of [false, true] (truthy) 20:4 warning missing starting space in comment (comments) 21:4 warning missing starting space in comment (comments) 42:4 warning missing starting space in comment (comments) 65:4 warning missing starting space in comment (comments) 87:4 error syntax error: found character '%' that cannot start any token test/salt/pillar/postgres.sls 4:2 error syntax error: found character '%' that cannot start any token ```	2019-08-16 17:00:02 +01:00
Imran Iqbal	115f638107	Merge pull request #279 from myii/ci/standardise-structure chore: use `semantic-release` cross-formula standard structure	2019-07-25 22:07:38 +01:00
Imran Iqbal	84eef0cf07	chore: use `semantic-release` cross-formula standard structure * Automated using `ssf-formula` (v0.1.0-rc.2)	2019-07-25 09:36:51 +01:00
semantic-release-bot	5df8f79dc1	chore(release): 0.38.0 [skip ci] # [0.38.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.4...v0.38.0) (2019-07-24) ### Continuous Integration * kitchen: remove `python-pip` installation ([`d999597`](https://github.com/saltstack-formulas/postgres-formula/commit/d999597)) kitchen+travis: modify matrix to include `develop` platform ([`3f81439`](https://github.com/saltstack-formulas/postgres-formula/commit/3f81439)) ### Features * debian: add buster support ([`904ba27`](https://github.com/saltstack-formulas/postgres-formula/commit/904ba27))	2019-07-24 20:40:03 +00:00
N	0046482adf	Merge pull request #278 from saltstack-formulas/add-debian-buster-support feat(debian): add buster support	2019-07-24 21:28:44 +01:00
John Keates	904ba271ca	feat(debian): add buster support	2019-07-24 22:12:26 +02:00
John Keates	e5700f48c5	Update codenamemap.yaml	2019-07-24 20:14:35 +02:00
Niels Abspoel	aa492c3ba9	Merge pull request #275 from myii/ci/standardise-structure chore: use `semantic-release` cross-formula standard structure	2019-07-23 21:01:18 +02:00
Imran Iqbal	72ff82ce75	chore: use `semantic-release` cross-formula standard structure * Automated using `ssf-formula` (v0.1.0-rc.1)	2019-07-19 12:34:38 +01:00
Imran Iqbal	5e631bf7d8	Merge pull request #272 from myii/chore/update-pre-salted-images ci(kitchen): remove `python*-pip` installation	2019-06-28 02:32:49 +01:00
Imran Iqbal	d999597a91	ci(kitchen): remove `python-pip` installation Now available in pre-salted images	2019-06-27 22:38:28 +01:00
Imran Iqbal	45a921dc4e	Merge pull request #271 from myii/chore/use-develop-image-in-matrix ci(kitchen+travis): modify matrix to include `develop` platform	2019-06-26 04:10:04 +01:00
Imran Iqbal	3f81439991	ci(kitchen+travis): modify matrix to include `develop` platform * Use balanced matrix based on `template-formula` guidelines * Initial ref: https://github.com/saltstack-formulas/template-formula/issues/118	2019-06-26 03:52:07 +01:00
semantic-release-bot	44b8fb1bc2	chore(release): 0.37.4 [skip ci] ## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31) ### Continuous Integration * travis: reduce matrix down to 6 instances ([`2ff919f`](https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f)) ### Tests * `services_spec`: remove temporary `suse` conditional ([`81165fc`](https://github.com/saltstack-formulas/postgres-formula/commit/81165fc)) * command_spec: use cleaner `match` string using `%r` ([`a054cea`](https://github.com/saltstack-formulas/postgres-formula/commit/a054cea)) * locale: improve test using locale `en_US.UTF-8` ([`7796064`](https://github.com/saltstack-formulas/postgres-formula/commit/7796064))	2019-05-31 17:53:44 +00:00
Imran Iqbal	cb4e405098	Merge pull request #269 from myii/chore/test-locales test(locale): improve test using locale `en_US.UTF-8`	2019-05-31 18:37:23 +01:00
Imran Iqbal	2ff919f1bf	ci(travis): reduce matrix down to 6 instances * Ref: https://github.com/saltstack-formulas/template-formula/pull/121	2019-05-31 02:19:35 +01:00
Imran Iqbal	81165fc405	test(`services_spec`): remove temporary `suse` conditional * `train` gem has been fixed upstream - https://github.com/inspec/train/pull/451 - https://rubygems.org/gems/train/versions/2.1.7	2019-05-31 02:15:57 +01:00
Javier Bértoli	a054cea962	test(command_spec): use cleaner `match` string using `%r`	2019-05-31 02:08:10 +01:00
Imran Iqbal	77960641dd	test(locale): improve test using locale `en_US.UTF-8`	2019-05-31 02:08:08 +01:00
semantic-release-bot	cb8de937a5	chore(release): 0.37.3 [skip ci] ## [0.37.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3) (2019-05-16) ### Bug Fixes * freebsd-user: fix FreeBSD daemon's user for PostgreSQL >= 9.6 ([`8745365`](https://github.com/saltstack-formulas/postgres-formula/commit/8745365)), closes [#263](https://github.com/saltstack-formulas/postgres-formula/issues/263)	2019-05-16 08:05:28 +00:00
Denys Havrysh	5763d220e5	Merge pull request #268 from Strade28/master fix(freebsd-user): fix FreeBSD daemon's user for PostgreSQL >= 9.6	2019-05-16 10:45:15 +03:00
julien levieil	8745365d71	fix(freebsd-user): fix FreeBSD daemon's user for PostgreSQL >= 9.6 For postgresql 9.6 and newer, the default unix user used by postgresql daemon has changed to 'postgres', and the default data directory is: /var/db/postgres/data96 Closes #263	2019-05-16 09:35:35 +11:00
semantic-release-bot	10126fb740	chore(release): 0.37.2 [skip ci] ## [0.37.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.1...v0.37.2) (2019-05-12) ### Bug Fixes * sysrc-svc: workaround *BSD minion indefinitely hanging on start ([`0aa8b4a`](https://github.com/saltstack-formulas/postgres-formula/commit/0aa8b4a))	2019-05-12 22:44:15 +00:00
Imran Iqbal	65519cb06f	Merge pull request #264 from sticky-note/master fix(sysrc-svc): workaround *BSD minion indefinitely hanging on start	2019-05-12 23:24:58 +01:00
sam	0aa8b4a048	fix(sysrc-svc): workaround *BSD minion indefinitely hanging on start Check https://github.com/saltstack/salt/issues/44848 for further details	2019-05-13 08:44:52 +11:00
semantic-release-bot	425049ceec	chore(release): 0.37.1 [skip ci] ## [0.37.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.0...v0.37.1) (2019-05-06) ### Documentation * readme: fix link for Travis badge ([`850ca6a`](https://github.com/saltstack-formulas/postgres-formula/commit/850ca6a))	2019-05-06 09:09:44 +00:00
Imran Iqbal	07d491e2cb	Merge pull request #267 from saltstack-formulas/myii-patch-1 docs(readme): fix link for Travis badge	2019-05-06 09:39:06 +01:00
Imran Iqbal	850ca6ae88	docs(readme): fix link for Travis badge	2019-05-06 09:38:49 +01:00
semantic-release-bot	e1dd2b3871	chore(release): 0.37.0 [skip ci] # [0.37.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.36.0...v0.37.0) (2019-05-06) ### Code Refactoring * kitchen: prefer `kitchen.yml` to `.kitchen.yml` ([`8f7cbde`](https://github.com/saltstack-formulas/postgres-formula/commit/8f7cbde)) ### Continuous Integration * gemfile: prepare for `inspec` testing ([`157e169`](https://github.com/saltstack-formulas/postgres-formula/commit/157e169)) * kitchen: use pre-salted images as used in `template-formula` ([`611ec11`](https://github.com/saltstack-formulas/postgres-formula/commit/611ec11)) * kitchen+travis: use newly available pre-salted images ([`7b7aadc`](https://github.com/saltstack-formulas/postgres-formula/commit/7b7aadc)) * pillar_from_files: use custom pillar based on `pillar.example` ([`c64d9e4`](https://github.com/saltstack-formulas/postgres-formula/commit/c64d9e4)) * travis: add `.travis.yml` based on `template-formula` ([`6467df7`](https://github.com/saltstack-formulas/postgres-formula/commit/6467df7)) ### Documentation * readme: update `Testing` section for `inspec` ([`4cfde8d`](https://github.com/saltstack-formulas/postgres-formula/commit/4cfde8d)) ### Features * implement `semantic-release` ([`7d3aa19`](https://github.com/saltstack-formulas/postgres-formula/commit/7d3aa19)) ### Tests * inspec: add tests for multiple ports and postgres versions ([`bf6a653`](https://github.com/saltstack-formulas/postgres-formula/commit/bf6a653)) * inspec: enable `use_upstream_repo` for `debian` & `centos-6` ([`49fdd33`](https://github.com/saltstack-formulas/postgres-formula/commit/49fdd33)) * inspec: replace `serverspec` with `inspec` tests ([`58ac122`](https://github.com/saltstack-formulas/postgres-formula/commit/58ac122)) * inspec: use relaxed command output match for the time being ([`3c53684`](https://github.com/saltstack-formulas/postgres-formula/commit/3c53684))	2019-05-06 07:40:39 +00:00
Éric Veiras Galisson	2a54616bc0	Merge pull request #262 from myii/chore/add-new-ci-matrix Replace `serverspec` with `inspec` tests via. new CI matrix (inc. `semantic-release`)	2019-05-06 09:18:26 +02:00
Imran Iqbal	7d3aa19b45	feat: implement `semantic-release`	2019-05-06 04:19:24 +01:00
Imran Iqbal	bf6a653e0b	test(inspec): add tests for multiple ports and postgres versions * Fix `opensuse-leap-15` (enable `suse` and workaround `service` bug) * Use port `5433` for `debian` and `opensuse-leap-15` * Use upstream repo version `10` for `debian`	2019-05-06 04:19:24 +01:00
Imran Iqbal	49fdd3333b	test(inspec): enable `use_upstream_repo` for `debian` & `centos-6` * Add new `centos-6` image * Install `9.6` from upstream repo	2019-05-06 04:19:24 +01:00
Imran Iqbal	4cfde8d6e9	docs(readme): update `Testing` section for `inspec`	2019-05-06 04:19:24 +01:00
Imran Iqbal	7b7aadc472	ci(kitchen+travis): use newly available pre-salted images	2019-05-06 04:19:22 +01:00
Imran Iqbal	3c53684109	test(inspec): use relaxed command output match for the time being * Fix the formula and then revert this eventually	2019-05-02 19:08:47 +01:00
Imran Iqbal	58ac122d50	test(inspec): replace `serverspec` with `inspec` tests	2019-05-02 19:08:47 +01:00
Imran Iqbal	c64d9e4ab9	ci(pillar_from_files): use custom pillar based on `pillar.example` * `pillar.example` will be difficult to get working at this stage * Ideally, work back towards `pillar.example` in the long run	2019-05-02 19:08:47 +01:00
Imran Iqbal	6467df70a0	ci(travis): add `.travis.yml` based on `template-formula`	2019-05-02 19:08:47 +01:00
Imran Iqbal	611ec11353	ci(kitchen): use pre-salted images as used in `template-formula`	2019-05-02 19:08:47 +01:00
Imran Iqbal	8f7cbdebc7	refactor(kitchen): prefer `kitchen.yml` to `.kitchen.yml` * Quoting from https://kitchen.ci/docs/getting-started/kitchen-yml/: - As of test-kitchen 1.21.0, we now prefer `kitchen.yml` over `.kitchen.yml`. - This preference applies to `kitchen.local.yml` as well. - This is backward compatible so the dot versions continue to work.	2019-05-02 19:08:47 +01:00
Imran Iqbal	157e1693a4	ci(gemfile): prepare for `inspec` testing	2019-05-02 19:08:47 +01:00