Compare commits
No commits in common. "85e34c73a3e02057319580eeed448967e5f9c442" and "053e45affc72f0b4b6870eec65dab24801d548e7" have entirely different histories.
85e34c73a3
...
053e45affc
@ -164,10 +164,6 @@ scriptHelp() {
|
|||||||
textblock "Path to write log file"
|
textblock "Path to write log file"
|
||||||
defaultsTextblock "(scriptPath/scriptName.log)"
|
defaultsTextblock "(scriptPath/scriptName.log)"
|
||||||
newline
|
newline
|
||||||
switchTextblock "--compression"
|
|
||||||
textblock "Compression algorithm(s) that borg should use. Please run 'borg help compression' for details."
|
|
||||||
defaultsTextblock "(not specified, use borg default of lz4)"
|
|
||||||
newline
|
|
||||||
switchTextblock "[SWITCH] -v | --verbose"
|
switchTextblock "[SWITCH] -v | --verbose"
|
||||||
textblock "Log borg output with increased verbosity (list all files). Careful! Your log file can get very large very quickly!"
|
textblock "Log borg output with increased verbosity (list all files). Careful! Your log file can get very large very quickly!"
|
||||||
defaultsTextblock "(normal output, option is OFF)"
|
defaultsTextblock "(normal output, option is OFF)"
|
||||||
@ -304,15 +300,6 @@ while [ $# -gt 0 ]; do
|
|||||||
badParam empty "$@"
|
badParam empty "$@"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
--compression)
|
|
||||||
# set borg archive compression
|
|
||||||
if [ -n "$2" ]; then
|
|
||||||
borgCompression="$2"
|
|
||||||
shift
|
|
||||||
else
|
|
||||||
badParam empty "$@"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
-v|--verbose)
|
-v|--verbose)
|
||||||
# set verbose logging from borg
|
# set verbose logging from borg
|
||||||
borgCreateParams='--list --stats'
|
borgCreateParams='--list --stats'
|
||||||
@ -380,7 +367,6 @@ while [ $# -gt 0 ]; do
|
|||||||
badParam empty "$@"
|
badParam empty "$@"
|
||||||
else
|
else
|
||||||
dockerStartTimeout="$2"
|
dockerStartTimeout="$2"
|
||||||
shift
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-t2|--timeout-stop)
|
-t2|--timeout-stop)
|
||||||
@ -388,7 +374,6 @@ while [ $# -gt 0 ]; do
|
|||||||
badParam empty "$@"
|
badParam empty "$@"
|
||||||
else
|
else
|
||||||
dockerStopTimeout="$2"
|
dockerStopTimeout="$2"
|
||||||
shift
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -432,10 +417,7 @@ fi
|
|||||||
if [ ! -f "$mcDockerCompose" ]; then
|
if [ ! -f "$mcDockerCompose" ]; then
|
||||||
badParam dne "(--docker-compose)" "$mcDockerCompose"
|
badParam dne "(--docker-compose)" "$mcDockerCompose"
|
||||||
fi
|
fi
|
||||||
# set compression level if specified
|
|
||||||
if [ -n "$borgCompression" ]; then
|
|
||||||
borgCreateParams="${borgCreateParams} --compression ${borgCompression}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
### read mailcow.conf and set vars as needed
|
### read mailcow.conf and set vars as needed
|
||||||
# shellcheck source=./mailcow.conf.shellcheck
|
# shellcheck source=./mailcow.conf.shellcheck
|
||||||
@ -633,7 +615,7 @@ if [ "$use503" -eq 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
### change to mailcow directory so docker commands execute properly
|
### change to mailcow directory so docker commands execute properly
|
||||||
\cd "${mcConfig%/*}" || exitError 100 'Could not change to mailcow directory.'
|
cd "${mcConfig%/*}" || exitError 100 'Could not change to mailcow directory.'
|
||||||
|
|
||||||
### stop postfix and dovecot mail containers to prevent mailflow during backup
|
### stop postfix and dovecot mail containers to prevent mailflow during backup
|
||||||
doDocker stop postfix
|
doDocker stop postfix
|
||||||
|
Loading…
Reference in New Issue
Block a user