Sync repo.

dbase.sh

@@ -13,7 +13,7 @@ if [[ ${psql_majorminor} -ge 9003 ]]; then
 fi
 
 function prepare_backup_db {
-    check_config_var "CONFLUENCE_BACKUP_DB"
+    check_config_var "CONFLUENCE_BACKUP_DB_TMP"
     check_config_var "POSTGRES_USERNAME"
     check_config_var "POSTGRES_HOST"
     check_config_var "POSTGRES_PORT"
@@ -21,10 +21,10 @@ function prepare_backup_db {
 }
 
 function backup_db {
-    [ -d "${CONFLUENCE_BACKUP_DB}" ] && rm -r "${CONFLUENCE_BACKUP_DB}"
-    mkdir -p "${CONFLUENCE_BACKUP_DB}"
-    run pg_dump -U "${POSTGRES_USERNAME}" -h "${POSTGRES_HOST}" --port=${POSTGRES_PORT} ${PG_PARALLEL} -Fd \
-        -d "${CONFLUENCE_DB}" ${PG_SNAPSHOT_OPT} -f "${CONFLUENCE_BACKUP_DB}"
+    [ -d "${CONFLUENCE_BACKUP_DB_TMP}" ] && rm -r "${CONFLUENCE_BACKUP_DB_TMP}"
+    mkdir -p "${CONFLUENCE_BACKUP_DB_TMP}"
+    run pg_dump -U "${POSTGRES_USERNAME}" -h "${POSTGRES_HOST}" --port=${POSTGRES_PORT} ${PG_PARALLEL} -Fd -d "${CONFLUENCE_DB}" ${PG_SNAPSHOT_OPT} -f "${CONFLUENCE_BACKUP_DB_TMP}"
+    perform_rsync_compress_db
 }
 
 function prepare_restore_db {
@@ -46,15 +46,21 @@ function prepare_restore_db {
 
 function restore_db {
     run pg_restore -U "${POSTGRES_USERNAME}" -h "${POSTGRES_HOST}" --port=${POSTGRES_PORT} ${PG_PARALLEL} \
-        -d postgres -C -Fd "${CONFLUENCE_RESTORE_DB}"
+        -d postgres -C -Ft "${CONFLUENCE_RESTORE_DB}"
 }
 
 function cleanup_incomplete_db_backup {
     info "Cleaning up DB backup created as part of failed/incomplete backup"
-    rm -r "${CONFLUENCE_BACKUP_DB}"
+    rm -r "${CONFLUENCE_BACKUP_DB_TMP}"
 }
 
 function cleanup_old_db_backups {
     # Not required as old backups with this strategy are typically cleaned up in the archiving strategy.
     no_op
-}
+}
+
+function perform_rsync_compress_db {
+    [ -d "${CONFLUENCE_BACKUP_DB}" ] && rm -r "${CONFLUENCE_BACKUP_DB}"
+    mkdir -p "${CONFLUENCE_BACKUP_DB}"
+    rsync  --remove-source-files -h $CONFLUENCE_BACKUP_DB_TMP/* $CONFLUENCE_BACKUP_DB/
+}