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

.travis.yml

@@ -22,21 +22,21 @@ env:
     # 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-29-2019-2-py3
     - INSTANCE: default-opensuse-leap-15-2019-2-py3
-    - INSTANCE: default-debian-9-2018-3-py2
+    # - INSTANCE: default-debian-9-2018-3-py2
     - INSTANCE: default-ubuntu-1604-2018-3-py2
-    - INSTANCE: default-centos-7-2018-3-py2
+    # - INSTANCE: default-centos-7-2018-3-py2
     - INSTANCE: default-fedora-29-2018-3-py2
     # TODO: Use this when fixed instead of `opensuse-423`
     # NOTE: Having to temporarily disable `opensuse-423` due to slow mirror
     # - INSTANCE: default-opensuse-leap-15-2018-3-py2
     # - INSTANCE: default-opensuse-423-2018-3-py2
-    - INSTANCE: default-debian-8-2017-7-py2
+    # - INSTANCE: default-debian-8-2017-7-py2
-    - INSTANCE: default-ubuntu-1604-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-fedora-28-2017-7-py2
-    - INSTANCE: default-opensuse-leap-42-2017-7-py2
+    # - INSTANCE: default-opensuse-leap-42-2017-7-py2
 
 script:
   - bundle exec kitchen verify ${INSTANCE}

AUTHORS.md

@@ -6,11 +6,11 @@ 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)|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)|47
+<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)|45
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|40
+<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://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|30
+<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://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|18
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|11
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|9
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>|[@dferrantelli](https://github.com/dferrantelli)|8
@@ -65,8 +65,9 @@ Avatar|Contributor|Contributions
 <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-05-06.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-05-31.

CHANGELOG.md

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

FORMULA

@@ -1,7 +1,7 @@
 name: postgres
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.37.1
+version: 0.37.4
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula

docs/AUTHORS.rst

@@ -19,21 +19,21 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
      - `@aboe76 <https://github.com/aboe76>`_
      - 47
+   * - :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>`_
+     - 45
    * - :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://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
-     - `@myii <https://github.com/myii>`_
-     - 40
    * - :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>`_
-     - 30
+     - 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://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
-     - `@javierbertoli <https://github.com/javierbertoli>`_
-     - 18
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
      - `@puneetk <https://github.com/puneetk>`_
      - 11
@@ -196,6 +196,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://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
@@ -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-05-06.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-05-31.

docs/CHANGELOG.rst

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

pillar.example

@@ -24,7 +24,10 @@ postgres:
   # 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,7 +36,7 @@ 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.

postgres/defaults.yaml

@@ -67,7 +67,9 @@ postgres:
 
   config_backup: '.bak'
 
-  service: postgresql
+  service:
+    name:  postgresql
+    sysrc: False
 
   bake_image: False
 

postgres/osfamilymap.yaml

@@ -21,20 +21,33 @@ Debian:
     {% endif %}
 
 FreeBSD:
-  conf_dir: /usr/local/pgsql/data
+    {% if repo.version|float >= 9.6 %}
-  data_dir: /usr/local/pgsql/data
+  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 +67,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 +146,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 +190,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:

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'

postgres/server/init.sls

@@ -31,8 +31,8 @@ postgresql-server:
     - require_in:
       - file: postgresql-server
   file.managed:
-    - name: /Library/LaunchAgents/{{ postgres.service }}.plist
+    - name: /Library/LaunchAgents/{{ postgres.service.name }}.plist
-    - source: /usr/local/opt/postgres/{{ postgres.service }}.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 %}

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

test/integration/default/controls/command_spec.rb

@@ -9,7 +9,6 @@ control 'Postgres command' do
 
   # 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(/.*db2.*my_space/) }
+    its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
-    # its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US\.UTF-8.*en_US\.UTF-8.*my_space/) }
   end
 end

test/integration/default/controls/services_spec.rb

@@ -7,11 +7,6 @@ elsif os[:family] == 'debian' or os[:name] == 'suse'
   pg_port = 5433
 end
 
-# Temporary `if` due to `opensuse-leap-15` bug re: `service`
-if os[:name] == 'suse'
-  puts "[Skip `service`-based tests due to `opensuse-leap-15` detection bug (see https://github.com/inspec/train/issues/377)]"
-  puts "[Skip `service`-based tests due to `opensuse-leap-15` bug]"
-else
 control 'Postgres service' do
   impact 0.5
   title 'should be running and enabled'
@@ -25,4 +20,3 @@ control 'Postgres service' do
     it { should be_listening }
   end
 end
-end

test/salt/pillar/postgres.sls

@@ -42,13 +42,13 @@ postgres:
   #   - postgresql-contrib
   #   - postgresql-plpython
 
-  # # CLUSTER
+  # CLUSTER
-  # # The default `encoding` is derived from the `locale` so not recommended
+  # The default `encoding` is derived from the `locale` so not recommended
-  # # to provide a value for it unless necessary
+  # to provide a value for it unless necessary
-  # cluster:
+  cluster:
-  #   locale: en_GB.UTF-8
+    locale: en_US.UTF-8
-  #   # encoding: UTF8
+    # encoding: UTF8
-  #
+
   # #'Alternatives system' priority incremental. 0 disables feature.
   # linux:
   #   altpriority: 30
@@ -166,20 +166,20 @@ postgres:
   # databases to be created
   databases:
     db1:
-      owner: 'localUser'
+      owner: localUser
-      # template: 'template0'
+      template: template0
-      # lc_ctype: 'en_US.UTF-8'
+      lc_ctype: en_US.UTF-8
-      # lc_collate: 'en_US.UTF-8'
+      lc_collate: en_US.UTF-8
     db2:
-      owner: 'remoteUser'
+      owner: remoteUser
-      # template: 'template0'
+      template: template0
-      # lc_ctype: 'en_US.UTF-8'
+      lc_ctype: en_US.UTF-8
-      # lc_collate: 'en_US.UTF-8'
+      lc_collate: en_US.UTF-8
-      tablespace: 'my_space'
+      tablespace: my_space
       # set custom schema
       schemas:
         public:
-          owner: 'localUser'
+          owner: localUser
       # enable per-db extension
       {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
       extensions: