diff --git a/CHANGELOG.md b/CHANGELOG.md index d781847..d0e3dd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.13 - 2019-03-09 - + +* Fixed Postgres backup without SPLIT_DB enabled (credit MelwinKfr@github) +* Added DB_PORT reference to properly backup Postgres with non default ports (thanks Maxximus007@github) + ## 1.12 - 2019-03-01 - * Fix for XZ Compression failing diff --git a/install/etc/s6/services/10-db-backup/run b/install/etc/s6/services/10-db-backup/run index 2dc34b4..424db43 100755 --- a/install/etc/s6/services/10-db-backup/run +++ b/install/etc/s6/services/10-db-backup/run @@ -146,7 +146,7 @@ function backup_mongo() { function backup_pgsql() { if [ "$SPLIT_DB" = "TRUE" ] || [ "$SPLIT_DB" = "true" ]; then export PGPASSWORD=${DBPASS} - DATABASES=`psql -h $DBHOST -U $DBUSER -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' ` + DATABASES=`psql -h $DBHOST -U $DBUSER -p ${DBPORT} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' ` for db in $DATABASES; do echo "** [db-backup] Dumping database: $db" TARGET=pgsql_${db}_${DBHOST}_${now}.sql @@ -157,7 +157,7 @@ function backup_pgsql() { done else export PGPASSWORD=${DBPASS} - pg_dump -h ${DBHOST} -U ${DBUSER} $db > ${TMPDIR}/${TARGET} + pg_dump -h ${DBHOST} -U ${DBUSER} -p ${DBPORT} ${DBNAME} > ${TMPDIR}/${TARGET} generate_md5 compression move_backup