Split conf/data directories, support

Author: noelmcloughlin

postgres/codenamemap.yaml

@@ -1,6 +1,7 @@
 ### Set parameters based on PostgreSQL version supplied with particular distro
 
 {% import_yaml "postgres/repo.yaml" as repo %}
+{% import_yaml "postgres/defaults.yaml" as defaults %}
 
   {# Generate lookup dictionary map for OS and derivative distributions
     name: distro codename
@@ -14,21 +15,26 @@
   {% if repo.use_upstream_repo == true %}
     {% set version = repo.version %}
     {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
+    {% set conf_dir = '/etc/postgresql/' + version|string + '/main' %}
+    {% set data_dir = '/var/lib/postgresql/' + version|string + '/main' %}
   {% else %}
     {% set fromrepo = name %}
+    {% set conf_dir = defaults.conf_dir %}
+    {% set data_dir = defaults.data_dir %}
   {% endif %}
 
 {{ 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 }}'
   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 }} main -d
+    pgtestfile: PG_VERSION
     user: root
 
 {% endmacro %}
@@ -40,13 +46,19 @@
   {% if repo.use_upstream_repo == true %}
     {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
     {% set version = repo.version %}
+    {% set conf_dir = '/etc/postgresql/' + version|string + '/main' %}
+    {% set data_dir = '/var/lib/postgresql/' + version|string + '/main' %}
   {% else %}
     {% set fromrepo = name %}
+    {% set conf_dir = defaults.conf_dir %}
+    {% set data_dir = defaults.data_dir %}
   {% endif %}
 
 {{ codename|default(name, true) }}:
   # PostgreSQL packages are mostly downloaded from `main` repo component
-  fromrepo: {{ name }}
+  conf_dir: {{ conf_dir }}
+  data_dir: {{ data_dir }}
+  fromrepo: {{ fromrepo }}
   pkg_repo:
     baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ version }}/fedora/fedora-$releasever-$basearch'
 

postgres/defaults.yaml

@@ -15,12 +15,13 @@ postgres:
   group: postgres
 
   prepare_cluster:
-    command: initdb --pgdata=/var/lib/pgsql/data
-    test: test -f /var/lib/pgsql/data/PG_VERSION
+    pgcommand: initdb --pgdata=
+    pgtestfile: PG_VERSION
     user: postgres
     env: []
 
   conf_dir: /var/lib/pgsql/data
+  data_dir: /var/lib/pgsql/data
   conf_dir_mode: '0700'
   postgresconf: ""
 

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/osfamilymap.yaml

@@ -4,9 +4,10 @@
 
 Arch:
   conf_dir: /var/lib/postgres/data
+  data_dir: /var/lib/postgres/data
   prepare_cluster:
-    command: initdb -D /var/lib/postgres/data
-    test: test -f /var/lib/postgres/data/PG_VERSION
+    pgcommand: initdb -D
+    pgtestfile: PG_VERSION
   pkg_client: postgresql-libs
   pkg_dev: postgresql
 
@@ -26,6 +27,8 @@ FreeBSD:
   user: pgsql
 
 OpenBSD:
+  conf_dir: /var/postgresql/data
+  data_dir: /var/postgresql/data
   user: _postgresql
 
 RedHat:
@@ -44,12 +47,13 @@ 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'
+    pgcommand: initdb --pgdata=
+    pgtestfile: PG_VERSION
 
   # Alternatives system
   linux:
@@ -113,19 +117,20 @@ 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'
+    pgcommand: initdb --pgdata=
+    pgtestfile: PG_VERSION
 
   # Alternatives system
   linux:

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
 

postgres/server/init.sls

@@ -61,27 +61,45 @@ postgresql-{{ bin }}-altinstall:
 {%- endif %}
 
 postgresql-cluster-prepared:
+  file.directory:
+    - names:
+      - {{ postgres.data_dir }}
+      - {{ postgres.conf_dir }}
+    - user: {{ postgres.user }}
+    - group: {{ postgres.group }}
+    - makedirs: True
+    - recurse:
+      - user
+      - group
+    - dir_mode: 755
   cmd.run:
+ {%- if postgres.prepare_cluster.command is defined %}
+      {# support for depreciated 'prepare_cluster.command' pillar #}
     - name: {{ postgres.prepare_cluster.command }}
+    - unless: {{ postgres.prepare_cluster.test }}
+ {%- else %}
+    - name: {{ postgres.prepare_cluster.pgcommand + ' ' }} {{ postgres.data_dir }}
+    - unless: test -f {{ postgres.data_dir }}/{{ postgres.prepare_cluster.pgtestfile }}
+ {%- endif %}
     - cwd: /
-    - runas: {{ postgres.prepare_cluster.user }}
     - env: {{ postgres.prepare_cluster.env }}
-    - unless:
-      - {{ postgres.prepare_cluster.test }}
+    - runas: {{ postgres.user }}
     - require:
       - pkg: postgresql-server
+      - file: postgresql-cluster-prepared
 
 postgresql-config-dir:
   file.directory:
-    - name: {{ postgres.conf_dir }}
+    - names:
+      - {{ postgres.data_dir }}
+      - {{ postgres.conf_dir }}
     - user: {{ postgres.user }}
     - group: {{ postgres.group }}
     - dir_mode: {{ postgres.conf_dir_mode }}
     - force: True
     - file_mode: 644
     - recurse:
-      - user
-      - group
+      - mode
     - makedirs: True
     - require:
       - cmd: postgresql-cluster-prepared