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

Merge branch 'master' of https://github.com/saltstack-formulas/postgres-formula into alts

Browse source
This commit is contained in:
noelmcloughlin 2018-04-22 01:42:12 -06:00
commit 82c2e6ccb6
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
postgres/client.sls → postgres/client/init.sls
View file

1
postgres/defaults.yaml
View file

@ -21,6 +21,7 @@ postgres:
env: [] env: []
conf_dir: /var/lib/pgsql/data conf_dir: /var/lib/pgsql/data
conf_dir_mode: '0775'
postgresconf: "" postgresconf: ""
macos: macos:

6
postgres/server/init.sls
View file

@ -73,7 +73,7 @@ postgresql-config-dir:
- name: {{ postgres.conf_dir }} - name: {{ postgres.conf_dir }}
- user: {{ postgres.user }} - user: {{ postgres.user }}
- group: {{ postgres.group }} - group: {{ postgres.group }}
- dir_mode: 775 - dir_mode: {{ postgres.conf_dir_mode }}
- force: True - force: True
- file_mode: 644 - file_mode: 644
- recurse: - recurse:
@ -115,7 +115,7 @@ postgresql-pg_hba:
- source: {{ postgres['pg_hba.conf'] }} - source: {{ postgres['pg_hba.conf'] }}
- template: jinja - template: jinja
- defaults: - defaults:
acls: {{ postgres.acls }} acls: {{ postgres.acls|yaml() }}
{%- if postgres.config_backup %} {%- if postgres.config_backup %}
# Create the empty file before managing to overcome the limitation of check_cmd # Create the empty file before managing to overcome the limitation of check_cmd
- onlyif: test -f {{ pg_hba_path }} || touch {{ pg_hba_path }} - onlyif: test -f {{ pg_hba_path }} || touch {{ pg_hba_path }}
@ -142,7 +142,7 @@ postgresql-pg_ident:
- source: {{ postgres['pg_ident.conf'] }} - source: {{ postgres['pg_ident.conf'] }}
- template: jinja - template: jinja
- defaults: - defaults:
mappings: {{ postgres.identity_map }} mappings: {{ postgres.identity_map|yaml() }}
{%- if postgres.config_backup %} {%- if postgres.config_backup %}
# Create the empty file before managing to overcome the limitation of check_cmd # Create the empty file before managing to overcome the limitation of check_cmd
- onlyif: test -f {{ pg_ident_path }} || touch {{ pg_ident_path }} - onlyif: test -f {{ pg_ident_path }} || touch {{ pg_ident_path }}