aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md11
-rw-r--r--templates/postgresql.12.conf.j212
-rw-r--r--templates/recovery.conf.j26
-rw-r--r--test/main.yml2
4 files changed, 22 insertions, 9 deletions
diff --git a/README.md b/README.md
index 3ab4153..e27734a 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,17 @@ postgres_clusters: # Mandatory
49 checksums: True # Optional 49 checksums: True # Optional
50 fsync_enabled: False # Optional 50 fsync_enabled: False # Optional
51 archive_enabled: False # Optional 51 archive_enabled: False # Optional
52 wal_level: 'logical' # Optional
53 max_replication_slots: 10 # Optional
54 barman_directory: None # Optional
55 # Define cluster as a standby server
56 primary: # Optional
57 host: '127.0.1.1' # Mandatory
58 port: 5433 # Mandatory
59 replication_user: 'replicator' # Mandatory
60 replication_password: 'SuperSecret' # Mandatory
61 restore_command: None # Optional
62 restore_barman_directory: None # Optional
52 # List of users to be created (optional) 63 # List of users to be created (optional)
53 users: 64 users:
54 - username: 'replicator' # Mandatory 65 - username: 'replicator' # Mandatory
diff --git a/templates/postgresql.12.conf.j2 b/templates/postgresql.12.conf.j2
index b49b836..3598319 100644
--- a/templates/postgresql.12.conf.j2
+++ b/templates/postgresql.12.conf.j2
@@ -260,20 +260,18 @@ archive_command = ''
260 260
261# These are only used in recovery mode. 261# These are only used in recovery mode.
262 262
263{% if postgres_primary %}
264{# In PG < 12 versions all the recovery settings were in a separate recovery.conf file #} 263{# In PG < 12 versions all the recovery settings were in a separate recovery.conf file #}
265restore_command = '/usr/bin/barman-wal-restore --user barman --parallel 8 {{ postgres_barman_server }} {{ postgres_primary.restore_directory }} %f %p' # command to use to restore an archived logfile segment 264{% if postgres_primary and postgres_primary.restore_command is defined %}
266 # placeholders: %p = path of file to restore 265restore_command = '{{ postgres_primary.restore_command }}' # command to use to restore an archived logfile segment
267 # %f = file name only 266{% elif postgres_primary and postgres_primary.restore_barman_directory is defined %}
268 # e.g. 'cp /mnt/server/archivedir/%f %p' 267restore_command = '/usr/bin/barman-wal-restore --user barman --parallel 8 {{ postgres_barman_server }} {{ postgres_primary.restore_barman_directory }} %f %p' # command to use to restore an archived logfile segment
269 # (change requires restart)
270{% else %} 268{% else %}
271#restore_command = '' # command to use to restore an archived logfile segment 269#restore_command = '' # command to use to restore an archived logfile segment
270{% endif %}
272 # placeholders: %p = path of file to restore 271 # placeholders: %p = path of file to restore
273 # %f = file name only 272 # %f = file name only
274 # e.g. 'cp /mnt/server/archivedir/%f %p' 273 # e.g. 'cp /mnt/server/archivedir/%f %p'
275 # (change requires restart) 274 # (change requires restart)
276{% endif %}
277#archive_cleanup_command = '' # command to execute at every restartpoint 275#archive_cleanup_command = '' # command to execute at every restartpoint
278#recovery_end_command = '' # command to execute at completion of recovery 276#recovery_end_command = '' # command to execute at completion of recovery
279 277
diff --git a/templates/recovery.conf.j2 b/templates/recovery.conf.j2
index 059b234..7078429 100644
--- a/templates/recovery.conf.j2
+++ b/templates/recovery.conf.j2
@@ -2,7 +2,11 @@
2# {{ ansible_managed }} 2# {{ ansible_managed }}
3 3
4standby_mode = 'on' 4standby_mode = 'on'
5restore_command = '/usr/bin/barman-wal-restore --user barman --parallel 8 {{ postgres_barman_server }} {{ postgres_primary.restore_directory }} %f %p' 5{% if postgres_primary.restore_command is defined %}
6restore_command = '{{ postgres_primary.restore_command }}'
7{% elif postgres_primary.restore_barman_directory is defined %}
8restore_command = '/usr/bin/barman-wal-restore --user barman --parallel 8 {{ postgres_barman_server }} {{ postgres_primary.restore_barman_directory }} %f %p'
9{% endif %}
6primary_conninfo = 'host={{ postgres_primary.host }} port={{ postgres_primary.port }} user={{ postgres_primary.replication_user }} password={{ postgres_primary.replication_password }} sslmode=require' 10primary_conninfo = 'host={{ postgres_primary.host }} port={{ postgres_primary.port }} user={{ postgres_primary.replication_user }} password={{ postgres_primary.replication_password }} sslmode=require'
7trigger_file = '/var/lib/postgresql/{{ postgres_version }}/{{ postgres_cluster_name }}/failover.trigger' 11trigger_file = '/var/lib/postgresql/{{ postgres_version }}/{{ postgres_cluster_name }}/failover.trigger'
8recovery_target_timeline='latest' 12recovery_target_timeline='latest'
diff --git a/test/main.yml b/test/main.yml
index 6a819d8..7d86f8d 100644
--- a/test/main.yml
+++ b/test/main.yml
@@ -91,7 +91,7 @@
91 primary: 91 primary:
92 host: postgres_one 92 host: postgres_one
93 port: 5432 93 port: 5432
94 restore_directory: "{{ postgres_barman_directory }}" 94 restore_barman_directory: "{{ postgres_barman_directory }}"
95 replication_user: "replicator" 95 replication_user: "replicator"
96 replication_password: "secret_repli" 96 replication_password: "secret_repli"
97 97