From 9b289b84026b9b042b947d0dd9b7a1d82e84ced2 Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Mon, 9 Apr 2018 15:50:17 +0100
Subject: [PATCH 1/3] Convert hex to decimal

---
 postgres/defaults.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index e737366..2e17dd8 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -21,7 +21,7 @@ postgres:
     env: []
 
   conf_dir: /var/lib/pgsql/data
-  conf_dir_mode: 0775
+  conf_dir_mode: '0775'
   postgresconf: ""
 
   macos:

From 15f3d5f5b46a5a495787862d095b186b66563d18 Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Wed, 11 Apr 2018 16:43:11 +0300
Subject: [PATCH 2/3] Fix compatibility with Salt 2018.3.0

---
 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 daf9d1b..da744fa 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -114,7 +114,7 @@ postgresql-pg_hba:
     - source: {{ postgres['pg_hba.conf'] }}
     - template: jinja
     - defaults:
-        acls: {{ postgres.acls }}
+        acls: {{ postgres.acls|yaml() }}
   {%- if postgres.config_backup %}
     # Create the empty file before managing to overcome the limitation of check_cmd
     - onlyif: test -f {{ pg_hba_path }} || touch {{ pg_hba_path }}
@@ -141,7 +141,7 @@ postgresql-pg_ident:
     - source: {{ postgres['pg_ident.conf'] }}
     - template: jinja
     - defaults:
-        mappings: {{ postgres.identity_map }}
+        mappings: {{ postgres.identity_map|yaml() }}
   {%- if postgres.config_backup %}
     # Create the empty file before managing to overcome the limitation of check_cmd
     - onlyif: test -f {{ pg_ident_path }} || touch {{ pg_ident_path }}

From 8dfc5a5983ac8f06b42db038d19e3c92cdcc6bb3 Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Sat, 31 Mar 2018 21:59:31 +0100
Subject: [PATCH 3/3] Tidyup if/else in upstream.sls

---
 postgres/upstream.sls | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/postgres/upstream.sls b/postgres/upstream.sls
index cf92872..2fae147 100644
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -22,14 +22,11 @@ postgresql-repo:
 
   {%- endif -%}
 
-{%- else -%}
+{%- elif grains.os not in ('Windows', 'MacOS',) %}
 
-# Notify that we don't manage this distro
-  {% if grains.os not in ('Windows', 'MacOS',) %}
 postgresql-repo:
   test.show_notification:
     - text: |
         PostgreSQL does not provide package repository for {{ grains['osfinger'] }}
-  {% endif %}
 
 {%- endif %}