From 69ef32edb4b5cce88a11e350e8752d96b9465ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Br=C3=A9fort?= Date: Sun, 21 Dec 2014 22:22:07 +0100 Subject: [PATCH 1/2] Add Ubuntu 14.10 map support. --- postgres/map.jinja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/postgres/map.jinja b/postgres/map.jinja index 5d141a1..5bf09f7 100644 --- a/postgres/map.jinja +++ b/postgres/map.jinja @@ -42,4 +42,12 @@ 'create_cluster': True, 'version': '9.3', }, + '14.10': { + 'pkg': 'postgresql', + 'pkg_dev': 'postgresql-server-dev-9.4', + 'conf_dir': '/etc/postgresql/9.4/main', + 'service': 'postgresql', + 'create_cluster': True, + 'version': '9.4', + }, }, grain='lsb_distrib_release', merge=salt['pillar.get']('postgres:lookup'))) %} From 4ced50dac34cfcc54440f0b729db65c1ebe83f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Br=C3=A9fort?= Date: Sun, 21 Dec 2014 23:11:00 +0100 Subject: [PATCH 2/2] Remove default cluster creation for Ubuntu. Since this is already done by the post-install script. --- postgres/map.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgres/map.jinja b/postgres/map.jinja index 5bf09f7..ca743fa 100644 --- a/postgres/map.jinja +++ b/postgres/map.jinja @@ -39,7 +39,7 @@ 'pkg_dev': 'postgresql-server-dev-9.3', 'conf_dir': '/etc/postgresql/9.3/main', 'service': 'postgresql', - 'create_cluster': True, + 'create_cluster': False, 'version': '9.3', }, '14.10': { @@ -47,7 +47,7 @@ 'pkg_dev': 'postgresql-server-dev-9.4', 'conf_dir': '/etc/postgresql/9.4/main', 'service': 'postgresql', - 'create_cluster': True, + 'create_cluster': False, 'version': '9.4', }, }, grain='lsb_distrib_release', merge=salt['pillar.get']('postgres:lookup'))) %}