From a7e9ea29a4b6616d807e7ca432fdbc6e2e23408a Mon Sep 17 00:00:00 2001
From: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
Date: Fri, 28 Oct 2016 15:25:51 +0200
Subject: [PATCH] Changed to use POSTGRES_DB.

---
 Dockerfile |  2 +-
 README.md  |  3 ++-
 backup.sh  | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a85cc12..3f8c103 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Pau Rodriguez-Estivill "prodrigestivill@gmail.com"
 ADD install.sh install.sh
 RUN sh install.sh && rm install.sh
 
-ENV POSTGRES_DATABASE **None**
+ENV POSTGRES_DB **None**
 ENV POSTGRES_HOST **None**
 ENV POSTGRES_PORT 5432
 ENV POSTGRES_USER **None**
diff --git a/README.md b/README.md
index 1839c2d..e29aacc 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Docker Compose:
 postgres:
   image: postgres
   environment:
+    POSTGRES_DB: dbname
     POSTGRES_USER: user
     POSTGRES_PASSWORD: password
 
@@ -30,7 +31,7 @@ pgbackups:
     BACKUP_KEEP_DAYS: 7
     BACKUP_KEEP_WEEKS: 4
     BACKUP_KEEP_MONTHS: 6
-    POSTGRES_DATABASE: dbname
+    POSTGRES_DB: dbname
     POSTGRES_USER: user
     POSTGRES_PASSWORD: password
     POSTGRES_EXTRA_OPTS: '-Z9 --schema=public --blobs'
diff --git a/backup.sh b/backup.sh
index 2c22084..e38ca02 100755
--- a/backup.sh
+++ b/backup.sh
@@ -3,8 +3,8 @@
 set -e
 set -o pipefail
 
-if [ "${POSTGRES_DATABASE}" = "**None**" ]; then
-  echo "You need to set the POSTGRES_DATABASE environment variable."
+if [ "${POSTGRES_DB}" = "**None**" ]; then
+  echo "You need to set the POSTGRES_DB environment variable."
   exit 1
 fi
 
@@ -36,22 +36,22 @@ KEEP_WEEKS=`expr $((($BACKUP_KEEP_WEEKS * 7) + 1))`
 KEEP_MONTHS=`expr $((($BACKUP_KEEP_MONTHS * 31) + 1))`
 
 #Initialize filename vers and dirs
-DFILE="$BACKUP_DIR/daily/$POSTGRES_DATABASE-`date +%Y%m%d-%H%M%S`.sql.gz"
-WFILE="$BACKUP_DIR/weekly/$POSTGRES_DATABASE-`date +%G%V`.sql.gz"
-MFILE="$BACKUP_DIR/monthly/$POSTGRES_DATABASE-`date +%Y%m`.sql.gz"
+DFILE="$BACKUP_DIR/daily/$POSTGRES_DB-`date +%Y%m%d-%H%M%S`.sql.gz"
+WFILE="$BACKUP_DIR/weekly/$POSTGRES_DB-`date +%G%V`.sql.gz"
+MFILE="$BACKUP_DIR/monthly/$POSTGRES_DB-`date +%Y%m`.sql.gz"
 mkdir -p "$BACKUP_DIR/daily/" "$BACKUP_DIR/weekly/" "$BACKUP_DIR/monthly/"
 
 #Create dump
-echo "Creating dump of ${POSTGRES_DATABASE} database from ${POSTGRES_HOST}..."
-pg_dump -f "$DFILE" $POSTGRES_HOST_OPTS $POSTGRES_DATABASE
+echo "Creating dump of ${POSTGRES_DB} database from ${POSTGRES_HOST}..."
+pg_dump -f "$DFILE" $POSTGRES_HOST_OPTS $POSTGRES_DB
 
 #Copy (hardlink) for each entry
 ln -vf "$DFILE" "$WFILE"
 ln -vf "$DFILE" "$MFILE"
 
 #Clean old files
-find "$BACKUP_DIR/daily" -maxdepth 1 -mtime +$KEEP_DAYS -name "$POSTGRES_DATABASE-*.sql*" -exec rm -rf '{}' ';'
-find "$BACKUP_DIR/weekly" -maxdepth 1 -mtime +$KEEP_WEEKS -name "$POSTGRES_DATABASE-*.sql*" -exec rm -rf '{}' ';'
-find "$BACKUP_DIR/monthly" -maxdepth 1 -mtime +$KEEP_MONTHS -name "$POSTGRES_DATABASE-*.sql*" -exec rm -rf '{}' ';'
+find "$BACKUP_DIR/daily" -maxdepth 1 -mtime +$KEEP_DAYS -name "$POSTGRES_DB-*.sql*" -exec rm -rf '{}' ';'
+find "$BACKUP_DIR/weekly" -maxdepth 1 -mtime +$KEEP_WEEKS -name "$POSTGRES_DB-*.sql*" -exec rm -rf '{}' ';'
+find "$BACKUP_DIR/monthly" -maxdepth 1 -mtime +$KEEP_MONTHS -name "$POSTGRES_DB-*.sql*" -exec rm -rf '{}' ';'
 
 echo "SQL backup uploaded successfully"