backup/backup.sh

@@ -119,14 +119,14 @@ doDocker() {
     if [ "$1" = "stop" ]; then
         printf "%s[%s] -- [INFO] Stopping %s-mailcow container --%s\n" \
             "$cyan" "$(stamp)" "$2" "$norm" >> "$logFile"
-        docker-compose -f "$mcDockerCompose" --env-path "$mcConfig" stop --timeout "$dockerStopTimeout" "$2-mailcow" 2>> "$logFile"
+        docker-compose -f "$mcDockerCompose" stop --timeout "$dockerStopTimeout" "$2-mailcow" 2>> "$logFile"
         # set result vars
         dockerResultState="$( docker inspect -f '{{ .State.Running }}' $containerName )"
         dockerResultExit="$( docker inspect -f '{{ .State.ExitCode }}' $containerName )"
     elif [ "$1" = "start" ]; then
         printf "%s[%s] -- [INFO] Starting %s-mailcow container --%s\n" \
             "$cyan" "$(stamp)" "$2" "$norm" >> "$logFile"
-        docker-compose -f "$mcDockerCompose" --env-path "$mcConfig" start "$2-mailcow" 2>> "$logFile"
+        docker-compose -f "$mcDockerCompose" start "$2-mailcow" 2>> "$logFile"
         # set result vars
         dockerResultState="$( docker inspect -f '{{ .State.Running }}' $containerName )"
     fi
@@ -246,7 +246,7 @@ webroot="/usr/share/nginx/html"
 
 # mailcow/docker related
 mcConfig='/opt/mailcow-dockerized/mailcow.conf'
-mcDockerCompose="${mcConfig%/*}/docker-compose.yml"
+mcDockerCompose="${mcConfig}/docker-compose.yml"
 dockerStartTimeout=180
 dockerStopTimeout=120
 
@@ -545,18 +545,6 @@ exclusions=1
 fi
 
 
-### set location of sql dump
-# this is done before resetting default TMP dir for borg
-if ! sqlDumpDir=$( mktemp -d 2>/dev/null ); then
-    exitError 115 'Unable to create temp directory for SQL dump.'
-else
-    sqlDumpFile="backup-$( date +%Y%m%d_%H%M%S ).sql"
-    sqlDumpDirCreated=1
-    printf "%s[%s] -- [INFO] SQL dump file will be stored at: %s --%s\n" \
-        "$cyan" "$(stamp)" "$sqlDumpDir/$sqlDumpFile" "$norm" >> "$logFile"
-fi
-
-
 ### create borg temp dir:
 ## python requires a writable temporary directory when unpacking borg and
 ## executing commands.  This defaults to /tmp but many systems mount /tmp with
@@ -576,6 +564,17 @@ fi
 export TMPDIR="${borgBaseDir}/tmp"
 
 
+### set location of sql dump
+if ! sqlDumpDir=$( mktemp -d 2>/dev/null ); then
+    exitError 115 'Unable to create temp directory for SQL dump.'
+else
+    sqlDumpFile="backup-$( date +%Y%m%d_%H%M%S ).sql"
+    sqlDumpDirCreated=1
+    printf "%s[%s] -- [INFO] SQL dump file will be stored at: %s --%s\n" \
+        "$cyan" "$(stamp)" "$sqlDumpDir/$sqlDumpFile" "$norm" >> "$logFile"
+fi
+
+
 ### 503 functionality
 if [ "$use503" -eq 1 ]; then
     printf "%s[%s] -- [INFO] Copying 503 error page to " \