Properly default postgresql_backup_remote_rsync_path

natefoo · natefoo · commit 2f6ee1fec7ce · 2017-04-04T11:36:39.000-04:00
diff --git a/templates/archive_wal.sh.j2 b/templates/archive_wal.sh.j2
@@ -17,7 +17,7 @@ mutex={{ postgresql_backup_local_dir }}/walmutex
 mailto='{{ postgresql_backup_mail_recipient }}'
 mutex_attempts=50
 
-[ '{{ postgresql_backup_remote_rsync_path | default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path }}' || remote_rsync=''
+[ '{{ postgresql_backup_remote_rsync_path | default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path | default("None") }}' || remote_rsync=''
 
 handler()
 {
diff --git a/templates/scheduled_backup.sh.j2 b/templates/scheduled_backup.sh.j2
@@ -10,7 +10,7 @@ mailto='{{ postgresql_backup_mail_recipient }}'
 mutex={{ postgresql_backup_local_dir }}/scheduledmutex
 rotate='{{ postgresql_backup_rotate | default("True") }}'
 
-[ '{{ postgresql_backup_remote_rsync_path | default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path }}' || remote_rsync=''
+[ '{{ postgresql_backup_remote_rsync_path | default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path | default("None") }}' || remote_rsync=''
 
 handler()
 {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ mutex={{ postgresql_backup_local_dir }}/walmutex`
`17`	`17`	`mailto='{{ postgresql_backup_mail_recipient }}'`
`18`	`18`	`mutex_attempts=50`
`19`	`19`
`20`		`-[ '{{ postgresql_backup_remote_rsync_path \| default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path }}' \|\| remote_rsync=''`
	`20`	`+[ '{{ postgresql_backup_remote_rsync_path \| default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path \| default("None") }}' \|\| remote_rsync=''`
`21`	`21`
`22`	`22`	`handler()`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ mailto='{{ postgresql_backup_mail_recipient }}'`
`10`	`10`	`mutex={{ postgresql_backup_local_dir }}/scheduledmutex`
`11`	`11`	`rotate='{{ postgresql_backup_rotate \| default("True") }}'`
`12`	`12`
`13`		`-[ '{{ postgresql_backup_remote_rsync_path \| default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path }}' \|\| remote_rsync=''`
	`13`	`+[ '{{ postgresql_backup_remote_rsync_path \| default("None") }}' != 'None' ] && remote_rsync='--rsync-path={{ postgresql_backup_remote_rsync_path \| default("None") }}' \|\| remote_rsync=''`
`14`	`14`
`15`	`15`	`handler()`
`16`	`16`	`{`