saltstack-formulas/postgres-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/postgres-formula.git synced 2025-04-11 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(version): bump to modern version

Browse source
This commit is contained in:
noelmcloughlin 2021-06-06 21:16:14 +01:00
parent 9e145be0ed
commit 92e0ad383c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pillar.example
View file

@ -10,7 +10,7 @@ postgres:
# Set true to configure upstream postgresql.org repository for YUM/APT/ZYPP # Set true to configure upstream postgresql.org repository for YUM/APT/ZYPP
use_upstream_repo: false use_upstream_repo: false
# Version to install from upstream repository (if upstream_repo: true) # 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 # 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 # as packages from upstream put them somewhere like /usr/pgsql-10/bin
add_profile: false add_profile: false
@ -76,12 +76,15 @@ postgres:
# The uppercase items must be replaced by actual values. # The uppercase items must be replaced by actual values.
# METHOD could be omitted, 'md5' will be appended by default. # 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 # If ``acls`` item value is empty ('', [], null), then the contents of
# ``pg_hba.conf`` file will not be touched at all. # ``pg_hba.conf`` file will not be touched at all.
acls: acls:
- ['local', 'db0', 'connuser', 'peer map=users_as_appuser'] - ['local', 'db0', 'connuser', 'peer map=users_as_appuser']
- ['local', 'db1', 'localUser'] - ['local', 'db1', 'localUser']
- ['host', 'db2', 'remoteUser', '192.168.33.0/24'] - ['host', 'db2', 'remoteUser', '192.168.33.0/24']
- ['host', 'all', 'all', '127.0.0.1/32', 'md5']
identity_map: identity_map:
- ['users_as_appuser', 'jdoe', 'connuser'] - ['users_as_appuser', 'jdoe', 'connuser']

2
postgres/defaults.yaml
View file

@ -6,7 +6,7 @@
postgres: postgres:
use_upstream_repo: true use_upstream_repo: true
add_profile: false # add bin_dir to $PATH, if installed from repos add_profile: false # add bin_dir to $PATH, if installed from repos
version: '11' version: '13'
pkg: postgresql pkg: postgresql
pkgs_extra: [] pkgs_extra: []
pkgs_deps: [] pkgs_deps: []

6
test/salt/pillar/postgres.sls
View file

@ -15,11 +15,7 @@ postgres:
{%- else %} {%- else %}
use_upstream_repo: True use_upstream_repo: True
# Version to install from upstream repository (if upstream_repo: True) # Version to install from upstream repository (if upstream_repo: True)
{%- if not (grains.os_family == 'Debian') %} version: '13'
version: '9.6'
{%- else %}
version: '10'
{%- endif %}
# # Set True to add a file in /etc/profile.d adding the bin dir in $PATH # # 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 # # as packages from upstream put them somewhere like /usr/pgsql-10/bin
# add_profile: False # add_profile: False