From aef555ad80ad34c54b761402922fd34200fcc1db Mon Sep 17 00:00:00 2001
From: Berry Langerak <berry@enrise.com>
Date: Mon, 6 Oct 2014 10:14:34 +0200
Subject: [PATCH] Fixing issues with Centos (initdb, and service name).

---
 postgres/init.sls  | 18 ++++++++++++++----
 postgres/map.jinja | 16 ++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/postgres/init.sls b/postgres/init.sls
index 7c6c2a0..9c6dcb4 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -16,6 +16,17 @@ create-postgresql-cluster:
       LC_ALL: C.UTF-8
 {% endif %}
 
+{% if postgres.init_db != False %}
+postgresql-initdb:
+  cmd.run:
+    - cwd: /
+    - user: root
+    - name: service postgresql initdb
+    - unless: test -f {{ postgres.conf_dir }}/postgresql.conf
+    - env:
+      LC_ALL: C.UTF-8
+{% endif %}
+
 run-postgresql:
   service.running:
     - enable: true
@@ -23,14 +34,13 @@ run-postgresql:
     - require:
       - pkg: {{ postgres.pkg }}
 
+{% if postgres.pkg_dev != False %}
 install-postgres-dev-package:
   pkg.installed:
     - name: {{ postgres.pkg_dev }}
+{% endif %}
 
-libpq-dev:
-  pkg.installed
-
-python-dev:
+{{ postgres.pkg_libpq_dev }}:
   pkg.installed
 
 {% if 'pg_hba.conf' in pillar.get('postgres', {}) %}
diff --git a/postgres/map.jinja b/postgres/map.jinja
index ce8ddb4..073a32e 100644
--- a/postgres/map.jinja
+++ b/postgres/map.jinja
@@ -2,24 +2,32 @@
     'Debian': {
         'pkg': 'postgresql-9.1',
         'pkg_dev': 'postgresql-server-dev-9.1',
+        'pkg_libpq_dev': 'libpq-dev',
         'python': 'python-pygresql',
         'service': 'postgresql',
         'conf_dir': '/etc/postgresql/9.1/main',
         'create_cluster': False,
+        'init_db': False,
     },
     'RedHat': {
-        'pkg': 'postgresql',
-        'pkg_dev': 'postgresql-server-dev-9.1',
-        'python': 'postgresql-python',
+        'pkg': 'postgresql-server',
+        'pkg_dev': 'postgresql-devel',
+        'pkg_libpq_dev': 'postgresql-libs',
+        'python': 'python-psycopg2',
         'service': 'postgresql',
+        'conf_dir': '/var/lib/pgsql/data',
         'create_cluster': False,
+        'init_db': True,
     },
     'Arch': {
         'pkg': 'postgresql',
-        'pkg_dev': 'postgresql-server-dev-9.1',
+        'pkg_dev': 'postgresql-devel',
+        'pkg_libpq_dev': 'postgresql-libs',
         'python': 'python-psycopg2',
         'service': 'postgresql',
+        'conf_dir': '/var/lib/pgsql/data/',
         'create_cluster': False,
+        'init_db': False,
     },
 }, merge=salt['grains.filter_by']({
     '14.04': {