From 61941eed22528013b24cd2845daacc0c67e8fe0c Mon Sep 17 00:00:00 2001 From: Dave lane Date: Fri, 9 Feb 2018 14:46:14 +1300 Subject: [PATCH] fixed bad config file path and reference to missing function --- dbbackup-docker-compose | 8 ++++---- default-docker-compose.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbbackup-docker-compose b/dbbackup-docker-compose index 3368463..28cc035 100755 --- a/dbbackup-docker-compose +++ b/dbbackup-docker-compose @@ -183,11 +183,11 @@ done # create the blank email report create_tmp_email # -if test -f $BU_CONF ; then - verbose "Reading default in $BU_CONF" - source $BU_CONF +if test -f $MAIN_DIR/$BU_CONF ; then + verbose "Reading default in $MAIN_DIR/$BU_CONF" + source $MAIN_DIR/$BU_CONF else - error "Couldn't find or read $BU_CONF" + message "ERROR: Couldn't find or read $MAIN_DIR/$BU_CONF" exit 1 fi # diff --git a/default-docker-compose.conf b/default-docker-compose.conf index 755faa6..ed02f86 100644 --- a/default-docker-compose.conf +++ b/default-docker-compose.conf @@ -6,7 +6,7 @@ BU_DIR=/home/data/mastodon/backup # Docker Compose details # # dir containing the docker-compose.yml -DC_DIR=/home/docker/mastodon-2.0.0 +DC_DIR=/home/docker/mastodon # name of the database container DC_CONTAINER=postgres # Command to dump the relevant database(s)