From 4aabfdeae84acef4c1306b2e3ccafb76093416a5 Mon Sep 17 00:00:00 2001
From: John Keates <john@keates.nl>
Date: Mon, 22 Dec 2014 15:02:13 +0100
Subject: [PATCH 1/2] Add support for Debian 7 and Debian 8

---
 postgres/map.jinja | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/postgres/map.jinja b/postgres/map.jinja
index ca743fa..39249d2 100644
--- a/postgres/map.jinja
+++ b/postgres/map.jinja
@@ -1,16 +1,4 @@
 {% set postgres = salt['grains.filter_by']({
-    'Debian': {
-        'pkg': 'postgresql-9.1',
-        'pkg_dev': 'postgresql-server-dev-9.1',
-        'pkg_libpq_dev': 'libpq-dev',
-        'python': 'python-pygresql',
-        'service': 'postgresql',
-        'pg_hba': '/etc/postgresql/9.1/main/pg_hba.conf',
-        'conf_dir': '/etc/postgresql/9.1/main',
-        'create_cluster': False,
-        'init_db': False,
-        'version': '9.1',
-    },
     'RedHat': {
         'pkg': 'postgresql-server',
         'pkg_dev': 'postgresql-devel',
@@ -50,4 +38,29 @@
         'create_cluster': False,
         'version': '9.4',
     },
-}, grain='lsb_distrib_release', merge=salt['pillar.get']('postgres:lookup'))) %}
+}, grain='lsb_distrib_release', merge=salt['grains.filter_by']({
+    'jessie': {
+        'pkg': 'postgresql-9.4',
+        'pkg_dev': 'postgresql-server-dev-9.4',
+        'pkg_libpq_dev': 'libpq-dev',
+        'python': 'python-pygresql',
+        'service': 'postgresql',
+        'pg_hba': '/etc/postgresql/9.4/main/pg_hba.conf',
+        'conf_dir': '/etc/postgresql/9.4/main',
+        'create_cluster': False,
+        'init_db': False,
+        'version': '9.4',
+    },
+        'wheezy': {
+        'pkg': 'postgresql-9.1',
+        'pkg_dev': 'postgresql-server-dev-9.1',
+        'pkg_libpq_dev': 'libpq-dev',
+        'python': 'python-pygresql',
+        'service': 'postgresql',
+        'pg_hba': '/etc/postgresql/9.1/main/pg_hba.conf',
+        'conf_dir': '/etc/postgresql/9.1/main',
+        'create_cluster': False,
+        'init_db': False,
+        'version': '9.1',
+    },
+}, grain='lsb_distrib_codename', merge=salt['pillar.get']('postgres:lookup')))) %}

From 503c5f9eea615de594cb92fdc678e1ea7c28fa57 Mon Sep 17 00:00:00 2001
From: John Keates <john@keates.nl>
Date: Mon, 22 Dec 2014 15:18:17 +0100
Subject: [PATCH 2/2] Fix indentation on line 54

---
 postgres/map.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres/map.jinja b/postgres/map.jinja
index 39249d2..f5b17c4 100644
--- a/postgres/map.jinja
+++ b/postgres/map.jinja
@@ -51,7 +51,7 @@
         'init_db': False,
         'version': '9.4',
     },
-        'wheezy': {
+    'wheezy': {
         'pkg': 'postgresql-9.1',
         'pkg_dev': 'postgresql-server-dev-9.1',
         'pkg_libpq_dev': 'libpq-dev',