From c2446884965d62b338f094113b66abf7db7e07e1 Mon Sep 17 00:00:00 2001
From: Audrey Roy <audreyr@gmail.com>
Date: Thu, 15 May 2014 14:44:39 -0700
Subject: [PATCH] Add pg_hba.conf, Ubuntu mapping, and example..

---
 pillar.example       |  3 +++
 postgres/init.sls    |  9 +++++++++
 postgres/map.jinja   |  6 ++++++
 postgres/pg_hba.conf | 20 ++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 postgres/pg_hba.conf

diff --git a/pillar.example b/pillar.example
index 331df2e..3187231 100644
--- a/pillar.example
+++ b/pillar.example
@@ -6,3 +6,6 @@
 postgres:
   lookup:
     pkg: postgresql-9.3
+  db:
+    name: mydb
+    user: mydb
\ No newline at end of file
diff --git a/postgres/init.sls b/postgres/init.sls
index 7d2f9ca..931534f 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -11,3 +11,12 @@ postgresql:
     - require:
       - pkg: {{ postgres.pkg }}
 
+pg_hba.conf:
+  file.managed:
+    - name: {{ postgres.pg_hba }}
+    - source: salt://postgres/pg_hba.conf
+    - user: postgres
+    - group: postgres
+    - mode: 644
+    - require:
+      - pkg: {{ postgres.pkg }}
\ No newline at end of file
diff --git a/postgres/map.jinja b/postgres/map.jinja
index a809e5d..e6578bc 100644
--- a/postgres/map.jinja
+++ b/postgres/map.jinja
@@ -14,4 +14,10 @@
         'python': 'python-psycopg2',
         'service': 'postgresql',
     },
+    'Ubuntu': {
+        'pkg': 'postgresql-9.3',
+        'python': 'libpq-dev',
+        'service': 'postgresql',
+        'pg_hba': '/etc/postgresql/9.3/main/pg_hba.conf',
+    },
 }, merge=salt['pillar.get']('postgres:lookup')) %}
diff --git a/postgres/pg_hba.conf b/postgres/pg_hba.conf
new file mode 100644
index 0000000..14d22f3
--- /dev/null
+++ b/postgres/pg_hba.conf
@@ -0,0 +1,20 @@
+# TYPE  DATABASE        USER            ADDRESS                 METHOD
+
+local  {{ pillar['postgres']['db']['name'] }}        {{ pillar['postgres']['db']['user'] }}                               md5
+
+# DO NOT DISABLE!
+# If you change this first entry you will need to make sure that the
+# database superuser can access the database using some other method.
+# Noninteractive access to all databases is required during automatic
+# maintenance (custom daily cronjobs, replication, and similar tasks).
+#
+# Database administrative login by Unix domain socket
+local   all             postgres                                peer
+
+
+# "local" is for Unix domain socket connections only
+local   all             all                                     trust
+# IPv4 local connections:
+host    all             all             127.0.0.1/32            trust
+# IPv6 local connections:
+host    all             all             ::1/128                 trust
\ No newline at end of file