chore(release): 0.40.2 [skip ci]

## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13) ### Bug Fixes * **freebsd:** no libpqdev freebsd package ([eca6d97](https://github.com/saltstack-formulas/postgres-formula/commit/eca6d97)) ### Continuous Integration * **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([9796319](https://github.com/saltstack-formulas/postgres-formula/commit/9796319))
Merge pull request #289 from noelmcloughlin/freebsd
2019-09-13 22:02:38 +00:00 · 2019-09-13 23:48:20 +02:00 · 2019-09-12 18:13:53 +02:00 · 2019-09-11 14:39:03 +01:00 · 2019-09-11 10:01:48 +00:00 · 2019-09-11 11:47:49 +02:00
16 changed files with 279 additions and 51 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+dist: bionic
 stages:
  - test
  - lint
@@ -10,7 +11,6 @@ stages:
 sudo: required
 cache: bundler
 language: ruby
-dist: xenial

 services:
  - docker
@@ -19,28 +19,30 @@ services:
 # the `platforms` defined in `kitchen.yml`
 env:
  matrix:
-    - INSTANCE: default-debian-9-develop-py3
-    # TODO: Re-enable this once the `systemd` service can be restarted reliably
+    - INSTANCE: default-debian-10-develop-py3
    # - INSTANCE: default-ubuntu-1804-develop-py3
    # - INSTANCE: default-centos-7-develop-py3
-    # - INSTANCE: default-fedora-29-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
-    # TODO: Re-enable this once the `systemd` service can be restarted reliably
    # - INSTANCE: default-ubuntu-1804-2019-2-py3
    - INSTANCE: default-centos-7-2019-2-py3
-    - INSTANCE: default-fedora-29-2019-2-py3
+    - INSTANCE: default-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-42-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-28-2017-7-py2
-    # - INSTANCE: default-opensuse-leap-42-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}
@@ -54,9 +56,9 @@ jobs:
      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
+        # Need at least `v1.17.0` for the `yaml-files` setting
+        - pip install --user yamllint>=1.17.0
+        - yamllint -s .
        # Install and run `commitlint`
        - npm install @commitlint/config-conventional -D
        - npm install @commitlint/travis-cli -D
--- a/.yamllint
+++ b/.yamllint
@@ -6,9 +6,11 @@ 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
+# 2. Any SLS files under directory `test/`, which are actually state files
+# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
 ignore: |
  node_modules/
+  test/**/states/**/*.sls
  pillar.example
  postgres/codenamemap.yaml
  postgres/osfamilymap.yaml
@@ -16,7 +18,19 @@ ignore: |
  postgres/repo.yaml
  test/salt/pillar/postgres.sls

+yaml-files:
+  # Default settings
+  - '*.yaml'
+  - '*.yml'
+  - .yamllint
+  # SaltStack Formulas additional settings
+  - '*.example'
+  - test/**/*.sls
+
 rules:
+  empty-values:
+    forbid-in-block-mappings: true
+    forbid-in-flow-mappings: true
  line-length:
    # Increase from default of `80`
    # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,9 +4,9 @@ This list is sorted by the number of commits per contributor in _descending_ ord

 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|58
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|53
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|49
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|62
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|59
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|53
 <img class='float-left rounded-1' src='https://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
@@ -50,6 +50,7 @@ Avatar|Contributor|Contributions
 <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://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|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
@@ -69,4 +70,4 @@ Avatar|Contributor|Contributions

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-17.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-09-13.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,48 @@
 # Changelog

+## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13)
+
+
+### Bug Fixes
+
+* **freebsd:** no libpqdev freebsd package ([eca6d97](https://github.com/saltstack-formulas/postgres-formula/commit/eca6d97))
+
+
+### Continuous Integration
+
+* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([9796319](https://github.com/saltstack-formulas/postgres-formula/commit/9796319))
+
+## [0.40.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.0...v0.40.1) (2019-09-11)
+
+
+### Continuous Integration
+
+* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([fc6cbe0](https://github.com/saltstack-formulas/postgres-formula/commit/fc6cbe0))
+
+
+### Documentation
+
+* **pillar.example:** update examples for freebsd ([a799214](https://github.com/saltstack-formulas/postgres-formula/commit/a799214))
+
+# [0.40.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.1...v0.40.0) (2019-09-03)
+
+
+### Features
+
+* **archlinux:** add support, fixing rendering errors ([e970925](https://github.com/saltstack-formulas/postgres-formula/commit/e970925))
+
+## [0.39.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.0...v0.39.1) (2019-09-01)
+
+
+### Continuous Integration
+
+* **kitchen+travis:** replace EOL pre-salted images ([140928b](https://github.com/saltstack-formulas/postgres-formula/commit/140928b))
+
+
+### Tests
+
+* **inspec:** fix reference to `suse` after gem `train` update ([677adba](https://github.com/saltstack-formulas/postgres-formula/commit/677adba))
+
 # [0.39.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.38.0...v0.39.0) (2019-08-17)


--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 name: postgres
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.39.0
+version: 0.40.2
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,13 +15,13 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - Contributions
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 58
+     - 62
   * - :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>`_
-     - 53
+     - 59
   * - :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>`_
-     - 49
+     - 53
   * - :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
@@ -151,6 +151,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/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://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
+     - `@n-rodriguez <https://github.com/n-rodriguez>`_
+     - 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
@@ -203,4 +206,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

 ----

-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-08-17.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-09-13.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,60 @@
 Changelog
 =========

+`0.40.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2>`_ (2019-09-13)
+-------------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **freebsd:** no libpqdev freebsd package (\ `eca6d97 <https://github.com/saltstack-formulas/postgres-formula/commit/eca6d97>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ `9796319 <https://github.com/saltstack-formulas/postgres-formula/commit/9796319>`_\ )
+
+`0.40.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.0...v0.40.1>`_ (2019-09-11)
+-------------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ `fc6cbe0 <https://github.com/saltstack-formulas/postgres-formula/commit/fc6cbe0>`_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **pillar.example:** update examples for freebsd (\ `a799214 <https://github.com/saltstack-formulas/postgres-formula/commit/a799214>`_\ )
+
+`0.40.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.1...v0.40.0>`_ (2019-09-03)
+-------------------------------------------------------------------------------------------------------------
+
+Features
+^^^^^^^^
+
+
+* **archlinux:** add support, fixing rendering errors (\ `e970925 <https://github.com/saltstack-formulas/postgres-formula/commit/e970925>`_\ )
+
+`0.39.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.0...v0.39.1>`_ (2019-09-01)
+-------------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen+travis:** replace EOL pre-salted images (\ `140928b <https://github.com/saltstack-formulas/postgres-formula/commit/140928b>`_\ )
+
+Tests
+^^^^^
+
+
+* **inspec:** fix reference to ``suse`` after gem ``train`` update (\ `677adba <https://github.com/saltstack-formulas/postgres-formula/commit/677adba>`_\ )
+
 `0.39.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.38.0...v0.39.0>`_ (2019-08-17)
 -------------------------------------------------------------------------------------------------------------

--- a/docs/TOFS_pattern.rst
+++ b/docs/TOFS_pattern.rst
@@ -444,3 +444,75 @@ Resulting in:
 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
@@ -12,9 +12,9 @@ driver:
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
  ## SALT `develop`
-  - name: debian-9-develop-py3
+  - name: debian-10-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:debian-9
+      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
@@ -30,9 +30,9 @@ platforms:
      provision_command:
        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
-  - name: fedora-29-develop-py3
+  - name: fedora-30-develop-py3
    driver:
-      image: netmanagers/salt-develop-py3:fedora-29
+      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
@@ -43,6 +43,16 @@ platforms:
        - 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
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-develop-py2
+    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
@@ -54,13 +64,20 @@ platforms:
  - name: centos-7-2019-2-py3
    driver:
      image: netmanagers/salt-2019.2-py3:centos-7
-  - name: fedora-29-2019-2-py3
+  - name: fedora-30-2019-2-py3
    driver:
-      image: netmanagers/salt-2019.2-py3:fedora-29
+      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
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:amazonlinux-2

  ## SALT `2018.3`
  - name: debian-9-2018-3-py2
@@ -75,10 +92,17 @@ platforms:
  - name: fedora-29-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:fedora-29
-  - name: opensuse-leap-42-2018-3-py2
+  - name: opensuse-leap-15-2018-3-py2
    driver:
-      image: netmanagers/salt-2018.3-py2:opensuse-leap-42
+      image: netmanagers/salt-2018.3-py2:opensuse-leap-15
      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:amazonlinux-2

  ## SALT `2017.7`
  - name: debian-8-2017-7-py2
@@ -91,13 +115,20 @@ platforms:
    driver:
      image: netmanagers/salt-2017.7-py2:centos-6
      run_command: /sbin/init
-  - name: fedora-28-2017-7-py2
+  - name: fedora-29-2017-7-py2
    driver:
-      image: netmanagers/salt-2017.7-py2:fedora-28
-  - name: opensuse-leap-42-2017-7-py2
+      image: netmanagers/salt-2017.7-py2:fedora-29
+  - name: opensuse-leap-15-2017-7-py2
    driver:
-      image: netmanagers/salt-2017.7-py2:opensuse-leap-42
+      image: netmanagers/salt-2017.7-py2:opensuse-leap-15
      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:amazonlinux-2

 provisioner:
  name: salt_solo
--- a/pillar.example
+++ b/pillar.example
@@ -32,7 +32,9 @@ postgres:
  #   flags: -w -s -m fast
  #   sysrc: true
  pkgs_extra:
+       {%- if grains.os_family not in ('FreeBSD',) %}
    - postgresql-contrib
+       {%- endif %}
    - postgresql-plpython

  # CLUSTER
@@ -91,7 +93,7 @@ postgres:
  config_backup: ".backup@{{ salt['status.time']('%y-%m-%d_%H:%M:%S') }}"
  {%- endif %}

-  {%- if grains['init'] == 'unknown' %}
+  {%- if 'init' in grains and grains['init'] == 'unknown' %}

  # If Salt is unable to detect init system running in the scope of state run,
  # probably we are trying to bake a container/VM image with PostgreSQL.
--- a/postgres/libtofs.jinja
+++ b/postgres/libtofs.jinja
@@ -2,7 +2,7 @@
                       lookup=None,
                       default_files_switch=['id', 'os_family'],
                       indent_width=6,
-                       v1_path_prefix='') %}
+                       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
@@ -17,8 +17,8 @@
        use as selector switch of the directories under
        "<path_prefix>/files"
      * indent_witdh: indentation of the result value to conform to YAML
-      * v1_path_prefix: (deprecated) only used for injecting a path prefix into
-        the source, to support older TOFS configs
+      * 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`):

@@ -64,10 +64,15 @@
  {%- set src_files = src_files + source_files %}
  {#- Only add to [''] when supporting older TOFS implementations #}
  {%- set path_prefix_exts = [''] %}
-  {%- if v1_path_prefix != '' %}
-    {%- do path_prefix_exts.append(v1_path_prefix) %}
+  {%- 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 %}
+  {%- 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 #}
--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -35,6 +35,7 @@ FreeBSD:
  conf_dir: /usr/local/pgsql/data
  data_dir: /usr/local/pgsql/data
    {% endif %}
+  pkg_libpq_dev: null  #not in freebsd
  pkg_client: postgresql{{ release }}-client
  pkg: postgresql{{ release }}-server
  prepare_cluster:
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -39,6 +39,6 @@ postgresql-repo:
 postgresql-repo:
  test.show_notification:
    - text: |
-        PostgreSQL does not provide package repository for {{ grains['osfinger'] }}
+        PostgreSQL does not provide package repository for {{ salt['grains.get']('osfinger', grains.os) }}

 {%- endif %}
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -1,6 +1,6 @@
-# Overide by OS
+# Overide by Platform
 pg_port = '5432'
-if os[:family] == 'debian' or os[:name] == 'suse'
+if platform[:family] == 'debian' or platform[:family] == 'suse'
  pg_port = '5433'
 end

--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -1,9 +1,9 @@
-# Overide by OS
+# Overide by Platform
 service_name = 'postgresql'
 pg_port = 5432
-if os[:name] == 'centos' and os[:release].start_with?('6')
+if platform[:name] == 'centos' and platform[:release].start_with?('6')
  service_name = 'postgresql-9.6'
-elsif os[:family] == 'debian' or os[:name] == 'suse'
+elsif platform[:family] == 'debian' or platform[:family] == 'suse'
  pg_port = 5433
 end

--- a/test/salt/pillar/postgres.sls
+++ b/test/salt/pillar/postgres.sls
@@ -1,7 +1,7 @@
 # Port to use for the cluster -- can be used to provide a non-standard port
 # NOTE: If already set in the minion config, that value takes priority

-{%- if not (grains.os_family == 'Debian' or grains.osfinger == 'Leap-15') %}
+{%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'Leap-15' %}
 postgres.port: '5432'
 {%- else %}
 postgres.port: '5433'
@@ -10,7 +10,7 @@ postgres.port: '5433'
 postgres:
  # UPSTREAM REPO
  # Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
-  {%- if not (grains.os_family == 'Debian' or grains.osfinger == 'CentOS-6') %}
+  {%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'CentOS-6' %}
  use_upstream_repo: False
  {%- else %}
  use_upstream_repo: True
@@ -181,7 +181,7 @@ postgres:
        public:
          owner: localUser
      # enable per-db extension
-      {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
+      {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
      extensions:
        uuid-ossp:
          schema: 'public'
@@ -194,7 +194,7 @@ postgres:
      owner: localUser

  # optional extensions to install in schema
-  {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
+  {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
  extensions:
    uuid-ossp:
      schema: uuid-ossp
Author	SHA1	Message	Date
semantic-release-bot	4c1f76f2ff	chore(release): 0.40.2 [skip ci] ## [0.40.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.1...v0.40.2) (2019-09-13) ### Bug Fixes * freebsd: no libpqdev freebsd package ([`eca6d97`](https://github.com/saltstack-formulas/postgres-formula/commit/eca6d97)) ### Continuous Integration * yamllint: add rule `empty-values` & use new `yaml-files` setting ([`9796319`](https://github.com/saltstack-formulas/postgres-formula/commit/9796319))	2019-09-13 22:02:38 +00:00
Nicolas Rodriguez	f99f2a0735	Merge pull request #289 from noelmcloughlin/freebsd fix(freebsd): no libpqdev freebsd package	2019-09-13 23:48:20 +02:00
Niels Abspoel	980ae5b42e	Merge pull request #287 from myii/chore/standardise-structure ci(yamllint): add rule `empty-values` & use new `yaml-files` setting	2019-09-12 18:13:53 +02:00
N	eca6d97e59	fix(freebsd): no libpqdev freebsd package	2019-09-11 14:39:03 +01:00
semantic-release-bot	5c21924335	chore(release): 0.40.1 [skip ci] ## [0.40.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.40.0...v0.40.1) (2019-09-11) ### Continuous Integration * use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([`fc6cbe0`](https://github.com/saltstack-formulas/postgres-formula/commit/fc6cbe0)) ### Documentation * pillar.example: update examples for freebsd ([`a799214`](https://github.com/saltstack-formulas/postgres-formula/commit/a799214))	2019-09-11 10:01:48 +00:00
N	81b1ed15c0	Merge pull request #288 from noelmcloughlin/archlinux docs(pillar.example): update examples for freebsd	2019-09-11 11:47:49 +02:00
N	a799214c34	docs(pillar.example): update examples for freebsd	2019-09-10 12:24:00 +01:00
Imran Iqbal	9796319a3f	ci(yamllint): add rule `empty-values` & use new `yaml-files` setting * Automated using https://github.com/myii/ssf-formula/pull/27	2019-09-10 05:56:02 +01:00
Niels Abspoel	6e0245a9e7	Merge pull request #286 from myii/chore/standardise-structure ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround	2019-09-08 21:43:34 +02:00
Imran Iqbal	fc6cbe0ab9	ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround * Automated using https://github.com/myii/ssf-formula/pull/22	2019-09-07 03:39:43 +01:00
semantic-release-bot	4c80c3641a	chore(release): 0.40.0 [skip ci] # [0.40.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.39.1...v0.40.0) (2019-09-03) ### Features * archlinux: add support, fixing rendering errors ([`e970925`](https://github.com/saltstack-formulas/postgres-formula/commit/e970925))	2019-09-03 18:39:35 +00:00
Niels Abspoel	3df38b1be2	Merge pull request #280 from noelmcloughlin/archlinux feat(archlinux): add support, fixing rendering errors	2019-09-03 20:29:24 +02:00
N	e9709254c6	feat(archlinux): add support, fixing rendering errors	2019-09-03 14:36:16 +01:00
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