Skip to content

Commit

Permalink
chore(version): bump to modern version
Browse files Browse the repository at this point in the history
  • Loading branch information
noelmcloughlin committed Jun 9, 2021
1 parent 9e145be commit 92e0ad3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
5 changes: 4 additions & 1 deletion pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion postgres/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
6 changes: 1 addition & 5 deletions test/salt/pillar/postgres.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 92e0ad3

Please sign in to comment.