From c3a32eb0aa32a48e737b77fd8dc49f9c65554e6e Mon Sep 17 00:00:00 2001
From: Imran Iqbal <myii@users.noreply.github.com>
Date: Thu, 21 Jun 2018 01:14:42 +0100
Subject: [PATCH 1/2] Fix `conf_dir` => `data_dir` required for preparing
 cluster

---
 postgres/server/init.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index 987391e..824eadc 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -62,7 +62,7 @@ postgresql-{{ bin }}-altinstall:
 
 postgresql-cluster-prepared:
   file.directory:
-    - name: {{ postgres.conf_dir }}
+    - name: {{ postgres.data_dir }}
     - user: {{ postgres.user }}
     - group: {{ postgres.group }}
     - makedirs: True
@@ -81,7 +81,7 @@ postgresql-cluster-prepared:
  {%- endif %}
     - cwd: /
     - env: {{ postgres.prepare_cluster.env }}
-    - runas: {{ postgres.user }}
+    - runas: {{ postgres.prepare_cluster.user }}
     - require:
       - pkg: postgresql-server
       - file: postgresql-cluster-prepared

From 67d6b8a5450906669bba6cea33253d03b228d4ec Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 21 Jun 2018 08:06:08 +0100
Subject: [PATCH 2/2] Ensure service starts after cluster created

---
 postgres/server/init.sls | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index 824eadc..3ffb75b 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -85,6 +85,8 @@ postgresql-cluster-prepared:
     - require:
       - pkg: postgresql-server
       - file: postgresql-cluster-prepared
+    - watch_in:
+      - module: postgresql-service-restart
 
 postgresql-config-dir:
   file.directory:
@@ -140,15 +142,15 @@ postgresql-conf:
     - watch_in:
       - module: postgresql-service-restart
 
+{%- endif %}
+
 # Restart the service where reloading is not sufficient
-# Currently only when changes are made to `postgresql.conf`
+# Currently when the cluster is created or changes made to `postgresql.conf`
 postgresql-service-restart:
   module.wait:
     - name: service.restart
     - m_name: {{ postgres.service }}
 
-{%- endif %}
-
 {%- set pg_hba_path = salt['file.join'](postgres.conf_dir, 'pg_hba.conf') %}
 
 postgresql-pg_hba: