Make local backup of pg_hba.conf file before modification

This commit is contained in:
Denys Havrysh
2017-01-13 12:09:45 +02:00
parent 98d39f296e
commit 79b83fe414
3 changed files with 26 additions and 11 deletions

View File

@@ -20,7 +20,6 @@ postgres:
conf_dir: /var/lib/pgsql/data
postgresconf: ""
postgresconf_backup: '.bak'
pg_hba.conf: salt://postgres/templates/pg_hba.conf.j2
acls:
@@ -31,6 +30,8 @@ postgres:
# IPv6 local connections:
- ['host', 'all', 'all', '::1/128', 'md5']
config_backup: '.bak'
service: postgresql
bake_image: False

View File

@@ -8,8 +8,6 @@
{%- do includes.append('postgres.upstream') %}
{%- endif %}
{%- set pkgs = [postgres.pkg] + postgres.pkgs_extra %}
{%- if includes -%}
include:
@@ -17,6 +15,8 @@ include:
{%- endif %}
{%- set pkgs = [postgres.pkg] + postgres.pkgs_extra %}
# Install, configure and start PostgreSQL server
postgresql-server:
@@ -82,7 +82,7 @@ postgresql-conf:
{{ postgres.postgresconf|indent(8) }}
- show_changes: True
- append_if_not_found: True
- backup: {{ postgres.postgresconf_backup }}
- backup: {{ postgres.config_backup }}
- require:
- file: postgresql-config-dir
- watch_in:
@@ -90,9 +90,23 @@ postgresql-conf:
{%- endif %}
{%- set pg_hba_path = salt['file.join'](postgres.conf_dir, 'pg_hba.conf') %}
postgresql-pg_hba-backup:
file.copy:
- name: {{ pg_hba_path ~ postgres.config_backup }}
- source: {{ pg_hba_path }}
- force: True
- user: {{ postgres.user }}
- group: {{ postgres.group }}
- mode: 600
- onlyif: test -f {{ pg_hba_path }}
- prereq:
- file: postgresql-pg_hba
postgresql-pg_hba:
file.managed:
- name: {{ postgres.conf_dir }}/pg_hba.conf
- name: {{ pg_hba_path }}
- user: {{ postgres.user }}
- group: {{ postgres.group }}
- mode: 600