Fixes for remote rsync + connection options

Author: natefoo

defaults/main.yml

@@ -31,11 +31,13 @@ postgresql_backup_keep: 30
 
 __postgresql_pgdg_bin_dir: "{{ '/usr/pgsql-' ~ (postgresql_version | replace('.', '')) ~ '/bin' }}"
 postgresql_backup_command: >-
-  {{ postgresql_backup_local_dir | quote }}/bin/backup.py
+  {{ postgresql_backup_python_executable }} {{ postgresql_backup_local_dir | quote }}/bin/backup.py
   {{ '--rsync-connect-opts ' ~ (postgresql_backup_rsync_connect_opts | quote) if postgresql_backup_rsync_connect_opts else '' }}
   --rsync-backup-opts {{ postgresql_backup_rsync_backup_opts | regex_replace('^-', '\-') | quote }}
   --keep {{ postgresql_backup_keep | quote }}
   {{ '--pg-bin-dir ' ~ __postgresql_pgdg_bin_dir if ansible_os_family == 'RedHat' else '' }}
   --backup --clean-archive {{ postgresql_backup_dir | quote }}
 
+postgresql_backup_python_executable: "python"
+
 postgresql_default_auth_method: "{{ (postgresql_version is version('13', '>')) | ternary('scram-sha-256', 'md5') }}"

files/backup.py

@@ -109,7 +109,7 @@ def pg_major_version(self):
     def rsync_cmd(self):
         cmd = ['rsync']
         if self._rsync_opts:
-            cmd.extend(shlex.split(rsync_opts))
+            cmd.extend(shlex.split(self._rsync_opts))
         return cmd
 
     @property

templates/archive_wal.sh.j2

@@ -13,10 +13,16 @@ wal_archive_dir={{ (postgresql_backup_dir ~ '/wal_archive') | quote }}
 file_path="$1"
 file_name="$2"
 
+{% if ":" in postgresql_backup_dir %}
+empty=$(mktemp -d -t ansible-postgresql-empty.XXXXXX)
+rsync {{ postgresql_backup_rsync_connect_opts }} "${empty}/" "$wal_archive_dir"
+rmdir "$empty"
+{% else %}
 mkdir -p "$wal_archive_dir"
+{% endif %}
 
 # If rsync outputs anything to stdout, the destination already existed, which should not happen
-if [ -n "$(rsync {{ postgresql_archive_wal_rsync_args }} "$file_path" "$wal_archive_dir")" ]; then
+if [ -n "$(rsync {{ postgresql_backup_rsync_connect_opts }} {{ postgresql_archive_wal_rsync_args }} "$file_path" "$wal_archive_dir")" ]; then
     echo "ERROR: ${wal_archive_dir}/${file_name} already exists, overwriting is not allowed!"
     exit 1
 fi