From f6e68157a3e2e88c4d9e3734ab5c6e6c7d22abd4 Mon Sep 17 00:00:00 2001
From: Dominic Ferrantelli <dominic@ferrantel.li>
Date: Tue, 21 Apr 2015 13:06:41 -0700
Subject: [PATCH] added client formula and required default values

---
 postgres/client.sls | 24 ++++++++++++++++++++++++
 postgres/map.jinja  |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 postgres/client.sls

diff --git a/postgres/client.sls b/postgres/client.sls
new file mode 100644
index 0000000..44986b1
--- /dev/null
+++ b/postgres/client.sls
@@ -0,0 +1,24 @@
+{% from "postgres/map.jinja" import postgres with context %}
+
+{% if salt['pillar.get']('postgres:use_upstream_repo') %}
+install-postgresql-repo:
+  pkgrepo.managed:
+    - humanname: PostgreSQL Official Repository
+    - name: {{ postgres.pkg_repo }}
+    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
+    - keyserver: keyserver.ubuntu.com
+    - file: {{ postgres.pkg_repo_file }}
+    - require_in:
+        - install-postgresql-client
+{% endif %}
+
+install-postgresql-client:
+  pkg.installed:
+    - name: {{ postgres.pkg_client }}
+    - refresh: {{ salt['pillar.get']('postgres:use_upstream_repo', False) }}
+
+{% if postgres.pkg_libpq_dev != False %}
+install-postgres-libpq-dev:
+  pkg.installed:
+    - name: {{ postgres.pkg_libpq_dev }}
+{% endif %}
diff --git a/postgres/map.jinja b/postgres/map.jinja
index f221cf7..543b4ab 100644
--- a/postgres/map.jinja
+++ b/postgres/map.jinja
@@ -15,6 +15,7 @@
         'pkg'            : 'postgresql-server',
         'pkg_dev'        : 'postgresql-devel',
         'pkg_libpq_dev'  : 'postgresql-libs',
+        'pkg_client'     : 'postgresql-client',
         'python'         : 'python-psycopg2',
         'service'        : 'postgresql',
         'conf_dir'       : '/var/lib/pgsql/data',
@@ -26,6 +27,7 @@
         'pkg'            : 'postgresql',
         'pkg_dev'        : 'postgresql-devel',
         'pkg_libpq_dev'  : 'postgresql-libs',
+        'pkg_client'     : 'postgresql-client',
         'python'         : 'python-psycopg2',
         'service'        : 'postgresql',
         'conf_dir'       : '/var/lib/pgsql/data',
@@ -37,6 +39,7 @@
         'pkg'            : 'postgresql-' + pg_version.id,
         'pkg_dev'        : 'postgresql-server-dev-' + pg_version.id,
         'pkg_libpq_dev'  : 'libpq-dev',
+        'pkg_client'     : 'postgresql-client-'+ pg_version.id,
         'pkg_contrib'    : 'postgresql-contrib-' + pg_version.id,
         'pkg_repo'       : 'deb http://apt.postgresql.org/pub/repos/apt/ ' + grains['lsb_distrib_codename'] + '-pgdg main',
         'pkg_repo_file'  : '/etc/apt/sources.list.d/pgdg.list',