From a291d40ef15483132ce7ac04bfa06e253861a770 Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Mon, 19 Dec 2016 12:29:14 +0200
Subject: [PATCH] Fix and set useful backup extension for postgresql.conf file

---
 pillar.example         | 21 +++++++++++++--------
 postgres/defaults.yaml | 38 +++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/pillar.example b/pillar.example
index 13e9887..98a4d10 100644
--- a/pillar.example
+++ b/pillar.example
@@ -14,6 +14,16 @@ postgres:
     - postgresql-contrib
     - postgresql-plpython
 
+  # This section will append your configuration to postgresql.conf.
+  postgresconf: |
+    listen_addresses = 'localhost,*'
+
+  # Backup extension for postgresql.conf file, defaults to `.bak`.
+  # Set to False to stop creation of backup on postgresql.conf changes.
+  {%- if 'status.time' in salt.keys() %}
+  postgresconf_backup: ".backup@{{ salt['status.time']('%y-%m-%d_%H:%M:%S') }}"
+  {%- endif %}
+
   # Path to the `pg_hba.conf` file Jinja template on Salt Fileserver
   pg_hba.conf: salt://postgres/templates/pg_hba.conf.j2
 
@@ -87,11 +97,13 @@ postgres:
     absentUser:
       ensure: absent
 
+  # tablespaces to be created
   tablespaces:
     my_space:
       directory: /srv/my_tablespace
       owner: localUser
 
+  # databases to be created
   databases:
     db1:
       owner: 'localUser'
@@ -118,11 +130,4 @@ postgres:
       maintenance_db: db1
     #postgis: {}
 
-  # Backup extension defaults to .bak if postgresconf_backup is True.
-  # Set to False to stop creation of backup on postgresql.conf changes.
-  postgresconf_backup: True
-  # This section will append your configuration to postgresql.conf.
-  postgresconf: |
-    listen_addresses = 'localhost,*'
-
-# vim: ft=yaml:sw=2
+# vim: ft=yaml ts=2 sts=2 sw=2 et
diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 9172a9b..a3bc212 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -11,23 +11,6 @@ postgres:
   python: python-psycopg2
   user: postgres
   group: postgres
-  conf_dir: /var/lib/pgsql/data
-  pg_hba.conf: salt://postgres/templates/pg_hba.conf.j2
-  acls:
-    # "local" is for Unix domain socket connections only
-    - ['local', 'all', 'all', 'peer']
-    # IPv4 local connections:
-    - ['host', 'all', 'all', '127.0.0.1/32', 'md5']
-    # IPv6 local connections:
-    - ['host', 'all', 'all', '::1/128', 'md5']
-  service: postgresql
-  users: {}
-  tablespaces: {}
-  databases: {}
-  schemas: {}
-  extensions: {}
-  postgresconf_backup: True
-  postgresconf: ""
 
   # if prepare_cluster is over-ridden in any of:
   # - osmap.yaml
@@ -39,3 +22,24 @@ postgres:
     command: service postgresql initdb
     test: test -f /var/lib/pgsql/data/PG_VERSION
     env: {}
+
+  conf_dir: /var/lib/pgsql/data
+  postgresconf: ""
+  postgresconf_backup: '.bak'
+
+  pg_hba.conf: salt://postgres/templates/pg_hba.conf.j2
+  acls:
+    # "local" is for Unix domain socket connections only
+    - ['local', 'all', 'all', 'peer']
+    # IPv4 local connections:
+    - ['host', 'all', 'all', '127.0.0.1/32', 'md5']
+    # IPv6 local connections:
+    - ['host', 'all', 'all', '::1/128', 'md5']
+
+  service: postgresql
+
+  users: {}
+  tablespaces: {}
+  databases: {}
+  schemas: {}
+  extensions: {}