From 78f2fae1ddc20b201bb63c36ab56a484948ff625 Mon Sep 17 00:00:00 2001 From: Pau Rodriguez-Estivill Date: Sat, 30 Jun 2018 14:38:17 +0200 Subject: [PATCH] Fixed password file errors --- backup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backup.sh b/backup.sh index afe03fc..9dd3928 100755 --- a/backup.sh +++ b/backup.sh @@ -22,7 +22,7 @@ if [ "${POSTGRES_USER}" = "**None**" ]; then exit 1 fi -if [ "${POSTGRES_PASSWORD}" = "**None**" ]; then +if [ "${POSTGRES_PASSWORD}" = "**None**" -a "${POSTGRES_PASSWORD_FILE}" = "**None**" ]; then echo "You need to set the POSTGRES_PASSWORD environment variable or link to a container named POSTGRES." exit 1 fi @@ -30,8 +30,11 @@ fi #Proces vars if [ "${POSTGRES_PASSWORD_FILE}" = "**None**" ]; then export PGPASSWORD=$POSTGRES_PASSWORD -else +else if [ -r "${POSTGRES_PASSWORD_FILE}" ]; then export PGPASSWORD=$(cat ${POSTGRES_PASSWORD_FILE}) +else + echo "Missing POSTGRES_PASSWORD_FILE file." + exit 1 fi POSTGRES_HOST_OPTS="-h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER $POSTGRES_EXTRA_OPTS" KEEP_DAYS=$BACKUP_KEEP_DAYS