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' into fromrepo

Browse source
This commit is contained in:
noelmcloughlin 2018-04-23 15:33:49 -06:00
commit 3f5c6b5010
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
postgres/defaults.yaml
View file

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

4
postgres/server/init.sls
View file

@ -117,7 +117,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 }}
@ -144,7 +144,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 }}

5
postgres/upstream.sls
View file

@ -22,14 +22,11 @@ postgresql-repo:
{%- endif -%} {%- endif -%}
{%- else -%} {%- elif grains.os not in ('Windows', 'MacOS',) %}
# Notify that we don't manage this distro
{% if grains.os not in ('Windows', 'MacOS',) %}
postgresql-repo: postgresql-repo:
test.show_notification: test.show_notification:
- text: | - text: |
PostgreSQL does not provide package repository for {{ grains['osfinger'] }} PostgreSQL does not provide package repository for {{ grains['osfinger'] }}
{% endif %}
{%- endif %} {%- endif %}