Merge pull request #20 from yaroslav-shabalin/wal_dir_rename

Properly handle WAL directory in backup scripts for version >=10

Author: natefoo

templates/backup_working_wal.sh.j2

@@ -3,13 +3,13 @@
 ## This file is maintained by Ansible - CHANGES WILL BE OVERWRITTEN
 ##
 
-xlog_dir='{{ postgresql_pgdata }}/pg_xlog'
+wal_dir='{{ postgresql_pgdata }}/{{ postgresql_version is version("10", ">=") | ternary("pg_wal", "pg_xlog") }}'
 backup_dir={{ postgresql_backup_active_dir }}
 mailto='{{ postgresql_backup_mail_recipient }}'
 
-active=`ls -1rtF $xlog_dir | grep -v '/$' | tail -1`
+active=`ls -1rtF $wal_dir | grep -v '/$' | tail -1`
 
-out=`scp -p $xlog_dir/$active $backup_dir/$active 2>&1`
+out=`scp -p $wal_dir/$active $backup_dir/$active 2>&1`
 ret=$?
 
 if [ $ret -ne 0 ]; then

templates/scheduled_backup.sh.j2

@@ -9,6 +9,7 @@ dir='{{ postgresql_backup_dir }}/current'
 mailto='{{ postgresql_backup_mail_recipient }}'
 mutex={{ postgresql_backup_local_dir }}/scheduledmutex
 rotate='{{ postgresql_backup_rotate | default("True") }}'
+wal_dir='{{ postgresql_version is version("10", ">=") | ternary("pg_wal", "pg_xlog") }}'
 
 [ '{{ postgresql_backup_remote_rsync_path | default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path | default("None") }}' || remote_rsync=''
 
@@ -83,7 +84,7 @@ backup_started=1
 handler mkdir -p $data/wal
 
 # begin the backup
-handler rsync $remote_rsync -rptg --delete --delete-delay --exclude pg_xlog $data/ $dir
+handler rsync $remote_rsync -rptg --delete --delete-delay --exclude $wal_dir $data/ $dir
 
 # tell postgres we're done
 psql_handler "SELECT pg_stop_backup();"