Syncing with upstream

pillar.example

@@ -1,9 +1,13 @@
+# 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)
-  version: '9.6'
+  version: '10'
   # 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'
@@ -22,19 +26,26 @@ postgres:
     - 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_GB.UTF-8
+    # encoding: UTF8
+
   #'Alternatives system' priority incremental. 0 disables feature.
   linux:
     altpriority: 30
 
   # macos limits
   limits:
     soft: 64000
-    hard: 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: |
+  postgresconf: |-
     listen_addresses = '*'  # listen on all interfaces
 
   # Path to the `pg_hba.conf` file Jinja template on Salt Fileserver

postgres/client/init.sls

@@ -1,7 +1,7 @@
 {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 {%- set pkgs = [] %}
-{%- for pkg in (postgres.pkg_client, postgres.pkg_libpq_dev) %}
+{%- for pkg in (postgres.pkg_client,) %}
   {%- if pkg %}
     {%- do pkgs.append(pkg) %}
   {%- endif %}
@@ -16,11 +16,14 @@ include:
 postgresql-client-libs:
   pkg.installed:
     - pkgs: {{ pkgs }}
-{%- if postgres.use_upstream_repo == true %}
+  {%- if postgres.use_upstream_repo == true %}
     - refresh: True
     - require:
       - pkgrepo: postgresql-repo
-{%- endif %}
+  {%- endif %}
+  {%- if postgres.fromrepo %}
+    - fromrepo: {{ postgres.fromrepo }}
+  {%- endif %}
 
 # Alternatives system. Make client binaries available in $PATH
 {%- if 'bin_dir' in postgres and postgres.linux.altpriority %}

postgres/codenamemap.yaml

@@ -10,25 +10,27 @@
 
 {% macro debian_codename(name, version, codename=none) %}
 
-  {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
     {% set version = repo.version %}
     {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
   {% else %}
     {% set fromrepo = name %}
   {% endif %}
+  {% set cluster_name = repo.cluster_name %}
+  {% set conf_dir = '/etc/postgresql/{0}/{1}'.format(version, cluster_name) %}
+  {% set data_dir = '/var/lib/postgresql/{0}/{1}'.format(version, cluster_name) %}
 
 {{ codename|default(name, true) }}:
   # PostgreSQL packages are mostly downloaded from `main` repo component
+  conf_dir: {{ conf_dir }}
+  data_dir: {{ data_dir }}
   fromrepo: {{ fromrepo }}
   pkg_repo:
-    name: 'deb http://apt.postgresql.org/pub/repos/apt {{ name }}-pgdg main {{ version }}'
+    name: 'deb http://apt.postgresql.org/pub/repos/apt {{ name }}-pgdg main'
   pkg: postgresql-{{ version }}
   pkg_client: postgresql-client-{{ version }}
-  conf_dir: /etc/postgresql/{{ version }}/main
   prepare_cluster:
-    command: pg_createcluster {{ version }} main
-    test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf
+    pgcommand: pg_createcluster {{ version }} {{ cluster_name }} -d
     user: root
 
 {% endmacro %}
@@ -38,15 +40,11 @@
 
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
-    {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
     {% set version = repo.version %}
-  {% else %}
-    {% set fromrepo = name %}
   {% endif %}
 
 {{ codename|default(name, true) }}:
   # PostgreSQL packages are mostly downloaded from `main` repo component
-  fromrepo: {{ name }}
   pkg_repo:
     baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ version }}/fedora/fedora-$releasever-$basearch'
 

postgres/defaults.yaml

@@ -2,11 +2,12 @@
 
 postgres:
   use_upstream_repo: True
-  version: '9.5'
+  version: '10'
   pkg: postgresql
   pkgs_extra: []
   pkg_client: postgresql-client
   pkg_dev: postgresql-devel
+  pkg_dev_deps: []
   pkg_libpq_dev: libpq-dev
   pkg_libs: postgresql-libs
   pkg_python: python-psycopg2
@@ -15,12 +16,18 @@ postgres:
   group: postgres
 
   prepare_cluster:
-    command: initdb --pgdata=/var/lib/pgsql/data
-    test: test -f /var/lib/pgsql/data/PG_VERSION
+    pgcommand: initdb -D
+    pgtestfile: PG_VERSION
     user: postgres
     env: []
 
+  cluster:
+    name: main    # Debian-based only
+    locale: ''    # Defaults to `C`
+    encoding: ''  # Defaults to `SQL_ASCII` if `locale` not provided
+
   conf_dir: /var/lib/pgsql/data
+  data_dir: /var/lib/pgsql/data
   conf_dir_mode: '0700'
   postgresconf: ""
 
@@ -47,6 +54,11 @@ postgres:
     - ['host', 'all', 'all', '127.0.0.1/32', 'md5']
     # IPv6 local connections:
     - ['host', 'all', 'all', '::1/128', 'md5']
+    # Allow replication connections from localhost, by a user with the
+    # replication privilege.
+    - ['local', 'replication', 'all', 'peer']
+    - ['host', 'replication', 'all', '127.0.0.1/32', 'md5']
+    - ['host', 'replication', 'all', '::1/128', 'md5']
 
   pg_ident.conf: salt://postgres/templates/pg_ident.conf.j2
   identity_map: []

postgres/dev.sls

@@ -1,26 +1,18 @@
 {% from tpldir + "/map.jinja" import postgres with context %}
 
 {% if grains.os not in ('Windows', 'MacOS',) %}
+  {%- set pkgs = [postgres.pkg_dev, postgres.pkg_libpq_dev] + postgres.pkg_dev_deps %}
 
-  {% if postgres.pkg_dev %}
-install-postgres-dev-package:
+  {% if pkgs %}
+install-postgres-dev-packages:
   pkg.installed:
-    - name: {{ postgres.pkg_dev }}
+    - pkgs: {{ pkgs }}
     {% if postgres.fromrepo %}
     - fromrepo: {{ postgres.fromrepo }}
     {% endif %}
   {% endif %}
 
-  {% if postgres.pkg_libpq_dev %}
-install-postgres-libpq-dev:
-  pkg.installed:
-    - name: {{ postgres.pkg_libpq_dev }}
-    {% if postgres.fromrepo %}
-    - fromrepo: {{ postgres.fromrepo }}
-    {% endif %}
-  {% endif %}
-
-# Alternatives system. Make devclient binaries available in $PATH
+  # Alternatives system. Make devclient binaries available in $PATH
   {%- if 'bin_dir' in postgres and postgres.linux.altpriority %}
     {%- for bin in postgres.dev_bins %}
       {%- set path = salt['file.join'](postgres.bin_dir, bin) %}
@@ -45,9 +37,10 @@ postgres_maxfiles_limits_conf:
   file.managed:
     - name: /Library/LaunchDaemons/limit.maxfiles.plist
     - source: salt://{{ tpldir }}/templates/limit.maxfiles.plist
+    - template: jinja
     - context:
-      soft_limit: {{ postgres.limits.soft or postgres.limits.hard }}
-      hard_limit: {{ postgres.limits.hard or postgres.limits.soft }}
+      soft_limit: {{ postgres.limits.soft }}
+      hard_limit: {{ postgres.limits.hard }}
     - group: {{ postgres.group }}
   {% endif %}
 

postgres/dropped.sls

@@ -27,4 +27,6 @@ postgresql-removed:
 
 postgres-dir-absent:
   file.absent:
-    - name: {{ postgres.conf_dir }}
+    - names:
+      - {{ postgres.conf_dir }}
+      - {{ postgres.data_dir }}

postgres/map.jinja

@@ -20,3 +20,13 @@
     ),
     base='postgres',
 ) %}
+
+{# Concatenate the cluster preparation command and then append it to the `postgres` dict #}
+{% set pc_cmd = '{0} {1}'.format(postgres.prepare_cluster.pgcommand, postgres.data_dir) %}
+{% if postgres.cluster.locale %}
+  {% set pc_cmd = '{0} --locale={1}'.format(pc_cmd, postgres.cluster.locale) %}
+{% endif %}
+{% if postgres.cluster.encoding %}
+  {% set pc_cmd = '{0} --encoding={1}'.format(pc_cmd, postgres.cluster.encoding) %}
+{% endif %}
+{% do postgres.update({'prepare_cluster_cmd': pc_cmd}) %}

postgres/osfamilymap.yaml

@@ -4,9 +4,7 @@
 
 Arch:
   conf_dir: /var/lib/postgres/data
-  prepare_cluster:
-    command: initdb -D /var/lib/postgres/data
-    test: test -f /var/lib/postgres/data/PG_VERSION
+  data_dir: /var/lib/postgres/data
   pkg_client: postgresql-libs
   pkg_dev: postgresql
 
@@ -26,6 +24,8 @@ FreeBSD:
   user: pgsql
 
 OpenBSD:
+  conf_dir: /var/postgresql/data
+  data_dir: /var/postgresql/data
   user: _postgresql
 
 RedHat:
@@ -44,13 +44,10 @@ RedHat:
   pkg_client: postgresql{{ release }}
   pkg_libs: postgresql{{ release }}-libs
   pkg_dev: postgresql{{ release }}-devel
-  conf_dir: /var/lib/pgsql/{{ repo.version }}/data
+  conf_dir: {{ data_dir }}
+  data_dir: {{ data_dir }}
   service: postgresql-{{ repo.version }}
 
-  prepare_cluster:
-    command: initdb --pgdata='{{ data_dir }}'
-    test: test -f '{{ data_dir }}/PG_VERSION'
-
   # Alternatives system
   linux:
     altpriority: 30
@@ -101,6 +98,11 @@ RedHat:
 
 {% endif %}
   pkg_libpq_dev: libpqxx-devel
+  pkg_dev_deps:
+    - perl-Time-HiRes
+    - libicu-devel
+    - perl-IPC-Run
+    - perl-Test-Simple
 
 Suse:
   pkg_repo:
@@ -113,20 +115,17 @@ Suse:
     gpgautoimport: True
 
 {% if repo.use_upstream_repo == true %}
-  {% set lib_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
+  {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
 
   fromrepo: pgdg-sles-{{ release }}
   pkg: postgresql{{ release }}-server
   pkg_client: postgresql{{ release }}
   pkg_dev: postgresql{{ release }}-devel
   pkg_libs: postgresql{{ release }}-libs
-  conf_dir: {{ lib_dir }}
+  conf_dir: {{ data_dir }}
+  data_dir: {{ data_dir }}
   service: postgresql-{{ repo.version }}
 
-  prepare_cluster:
-    command: /usr/pgsql-{{ repo.version }}/bin/initdb --pgdata='{{ lib_dir }}'
-    test: test -f '{{ lib_dir }}/PG_VERSION'
-
   # Alternatives system
   linux:
     altpriority: 30
@@ -162,7 +161,7 @@ Suse:
   pkg_client: postgresql
 
 {% endif %}
-  pkg_libpq_dev: libqpxx
+  pkg_libpq_dev: libpqxx
 
 {%- if grains.os == 'MacOS' %}
 ## jinja check avoids rendering noise/failure on Linux
@@ -179,11 +178,14 @@ MacOS:
   user: {{ repo.user }}
   group: {{ repo.group }}
   conf_dir: /Users/{{ repo.user }}/Library/AppSupport/postgres_{{ repo.use_upstream_repo }}
+  data_dir: /Users/{{ repo.user }}/Library/AppSupport/postgres_{{ repo.use_upstream_repo }}
   prepare_cluster:
-    command: initdb -D /Users/{{ repo.user }}/Library/AppSupport/postgres_{{ repo.use_upstream_repo }}
-    test: test -f /Users/{{ repo.user }}/Library/AppSupport/postgres_{{ repo.use_upstream_repo }}/PG_VERSION
     user: {{ repo.user }}
     group: {{ repo.group }}
+  # macos limits
+  limits:
+    soft: 64000
+    hard: 64000
 {%- endif %}
 
 # vim: ft=sls

postgres/python.sls

@@ -1,8 +1,16 @@
 {% from tpldir + "/map.jinja" import postgres with context %}
 
+include:
+  - postgres.upstream
+
 postgresql-python:
   pkg.installed:
     - name: {{ postgres.pkg_python}}
   {% if postgres.fromrepo %}
     - fromrepo: {{ postgres.fromrepo }}
   {% endif %}
+  {% if postgres.use_upstream_repo == true %}
+    - refresh: True
+    - require:
+      - pkgrepo: postgresql-repo
+  {% endif %}

postgres/repo.yaml

@@ -6,11 +6,12 @@
 use_upstream_repo: {{ salt['pillar.get']('postgres:use_upstream_repo', defaults.postgres.use_upstream_repo) }}
 version: {{ salt['pillar.get']('postgres:version', defaults.postgres.version) }}
 fromrepo: {{ salt['pillar.get']('postgres:fromrepo', defaults.postgres.fromrepo) }}
+cluster_name: {{ salt['pillar.get']('postgres:cluster:name', defaults.postgres.cluster.name) }}
 
 #Early lookup for system user on MacOS
 {% if grains.os == 'MacOS' %}
-  {% set sysuser = salt['pillar.get']('postgres.user') or salt['cmd.run']("stat -f '%Su' /dev/console") %}
-  {% set sysgroup = salt['pillar.get']('postgres.group') or salt['cmd.run']("stat -f '%Sg' /dev/console") %}
+  {% set sysuser = salt['pillar.get']('postgres:user', salt['cmd.run']("stat -f '%Su' /dev/console")) %}
+  {% set sysgroup = salt['pillar.get']('postgres:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) %}
 user: {{ sysuser }}
 group: {{ sysgroup }}
 {% endif %}

postgres/server/image.sls

@@ -12,10 +12,10 @@ include:
 
 postgresql-start:
   cmd.run:
-    - name: pg_ctl -D {{ postgres.conf_dir }} -l logfile start
+    - name: pg_ctl -D {{ postgres.data_dir }} -l logfile start
     - runas: {{ postgres.user }}
     - unless:
-      - ps -p $(head -n 1 {{ postgres.conf_dir }}/postmaster.pid) 2>/dev/null
+      - ps -p $(head -n 1 {{ postgres.data_dir }}/postmaster.pid) 2>/dev/null
     - require:
       - file: postgresql-pg_hba