2 files changed, 10 insertions, 8 deletions

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 = ''
 
 # These are only used in recovery mode.
 
-{% if postgres_primary %}
 {# In PG < 12 versions all the recovery settings were in a separate recovery.conf file #}
-restore_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
-                                # placeholders: %p = path of file to restore
-                                #               %f = file name only
-                                # e.g. 'cp /mnt/server/archivedir/%f %p'
-                                # (change requires restart)
+{% if postgres_primary and postgres_primary.restore_command is defined %}
+restore_command = '{{ postgres_primary.restore_command }}'              # command to use to restore an archived logfile segment
+{% elif postgres_primary and postgres_primary.restore_barman_directory is defined %}
+restore_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
 {% else %}
 #restore_command = ''           # command to use to restore an archived logfile segment
+{% endif %}
                                 # placeholders: %p = path of file to restore
                                 #               %f = file name only
                                 # e.g. 'cp /mnt/server/archivedir/%f %p'
                                 # (change requires restart)
-{% endif %}
 #archive_cleanup_command = ''   # command to execute at every restartpoint
 #recovery_end_command = ''      # command to execute at completion of recovery
 
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 @@
 # {{ ansible_managed }}
 
 standby_mode = 'on'
-restore_command = '/usr/bin/barman-wal-restore --user barman --parallel 8 {{ postgres_barman_server }} {{ postgres_primary.restore_directory }} %f %p'
+{% if postgres_primary.restore_command is defined %}
+restore_command = '{{ postgres_primary.restore_command }}'
+{% elif postgres_primary.restore_barman_directory is defined %}
+restore_command = '/usr/bin/barman-wal-restore --user barman --parallel 8 {{ postgres_barman_server }} {{ postgres_primary.restore_barman_directory }} %f %p'
+{% endif %}
 primary_conninfo = 'host={{ postgres_primary.host }} port={{ postgres_primary.port }} user={{ postgres_primary.replication_user }} password={{ postgres_primary.replication_password }} sslmode=require'
 trigger_file = '/var/lib/postgresql/{{ postgres_version }}/{{ postgres_cluster_name }}/failover.trigger'
 recovery_target_timeline='latest'