Skip to content

Commit 0d26a72

Browse files
Fix default ~postgres/backup for local backups
The problem was that scripts ended up quoting the value like this mutex="~postgres/backup/walmutex" and ~postgres did not get expanded correctly.
1 parent 1fad47e commit 0d26a72

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

templates/archive_wal.sh.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ full_file=$1
1111
file=$2
1212
server=`hostname`
1313

14-
active_dir='{{ postgresql_backup_active_dir }}'
14+
active_dir={{ postgresql_backup_active_dir }}
1515
backup_dir="{{ postgresql_backup_dir }}/current/wal"
16-
mutex="{{ postgresql_backup_local_dir }}/walmutex"
16+
mutex={{ postgresql_backup_local_dir }}/walmutex
1717
mailto='{{ postgresql_backup_mail_recipient }}'
1818
mutex_attempts=50
1919

templates/backup_working_wal.sh.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
##
55

66
xlog_dir='{{ postgresql_pgdata }}/pg_xlog'
7-
backup_dir='{{ postgresql_backup_active_dir }}'
7+
backup_dir={{ postgresql_backup_active_dir }}
88
mailto='{{ postgresql_backup_mail_recipient }}'
99

1010
active=`ls -1rtF $xlog_dir | grep -v '/$' | tail -1`

templates/scheduled_backup.sh.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ server=`hostname`
77
data='{{ postgresql_pgdata }}'
88
dir='{{ postgresql_backup_dir }}/current'
99
mailto='{{ postgresql_backup_mail_recipient }}'
10-
mutex='{{ postgresql_backup_local_dir }}/scheduledmutex'
10+
mutex={{ postgresql_backup_local_dir }}/scheduledmutex
1111
rotate='{{ postgresql_backup_rotate | default("True") }}'
1212

1313
[ '{{ postgresql_backup_remote_rsync_path | default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path }}' || remote_rsync=''

0 commit comments

Comments
 (0)