From 92e0ad383c0cda8f5a89a6df03c2f079880dcde2 Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Sun, 6 Jun 2021 21:16:14 +0100
Subject: [PATCH] chore(version): bump to modern version

---
 pillar.example                | 5 ++++-
 postgres/defaults.yaml        | 2 +-
 test/salt/pillar/postgres.sls | 6 +-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pillar.example b/pillar.example
index f2cd8363..040537a7 100644
--- a/pillar.example
+++ b/pillar.example
@@ -10,7 +10,7 @@ postgres:
   # Set true to configure upstream postgresql.org repository for YUM/APT/ZYPP
   use_upstream_repo: false
   # Version to install from upstream repository (if upstream_repo: true)
-  version: '10'
+  version: '13'
   # Set true to add a file in /etc/profile.d adding the bin dir in $PATH
   # as packages from upstream put them somewhere like /usr/pgsql-10/bin
   add_profile: false
@@ -76,12 +76,15 @@ postgres:
   # The uppercase items must be replaced by actual values.
   # METHOD could be omitted, 'md5' will be appended by default.
   #
+  # Postgres expect a valid CIDR for ADDRESS (not ipaddress)
+  #
   # If ``acls`` item value is empty ('', [], null), then the contents of
   # ``pg_hba.conf`` file will not be touched at all.
   acls:
     - ['local', 'db0', 'connuser', 'peer map=users_as_appuser']
     - ['local', 'db1', 'localUser']
     - ['host', 'db2', 'remoteUser', '192.168.33.0/24']
+    - ['host', 'all', 'all', '127.0.0.1/32', 'md5']
 
   identity_map:
     - ['users_as_appuser', 'jdoe', 'connuser']
diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index a6057ccd..311520ec 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -6,7 +6,7 @@
 postgres:
   use_upstream_repo: true
   add_profile: false  # add bin_dir to $PATH, if installed from repos
-  version: '11'
+  version: '13'
   pkg: postgresql
   pkgs_extra: []
   pkgs_deps: []
diff --git a/test/salt/pillar/postgres.sls b/test/salt/pillar/postgres.sls
index b556978a..3bfa7963 100644
--- a/test/salt/pillar/postgres.sls
+++ b/test/salt/pillar/postgres.sls
@@ -15,11 +15,7 @@ postgres:
   {%- else %}
   use_upstream_repo: True
   # Version to install from upstream repository (if upstream_repo: True)
-  {%- if not (grains.os_family == 'Debian') %}
-  version: '9.6'
-  {%- else %}
-  version: '10'
-  {%- endif %}
+  version: '13'
   # # Set True to add a file in /etc/profile.d adding the bin dir in $PATH
   # # as packages from upstream put them somewhere like /usr/pgsql-10/bin
   # add_profile: False