Compare commits

...

3 Commits

Author SHA1 Message Date
Asif Bacchus
f57841b69a update in-script help 2020-05-07 01:43:53 -06:00
Asif Bacchus
4d407887d5 change default docker-compose path 2020-05-07 01:35:20 -06:00
Asif Bacchus
6f59804cfc docker-compose and mailcow-config accept full path 2020-05-07 01:34:43 -06:00

View File

@ -149,7 +149,7 @@ scriptHelp() {
printf "%sUsage: %s [parameters]%s\n\n" "$bold" "$scriptName" "$norm" printf "%sUsage: %s [parameters]%s\n\n" "$bold" "$scriptName" "$norm"
textblock "There are NO mandatory parameters. If a parameter is not supplied, its default value will be used. In the case of a switch parameter, it will remain DEactivated if NOT specified." textblock "There are NO mandatory parameters. If a parameter is not supplied, its default value will be used. In the case of a switch parameter, it will remain DEactivated if NOT specified."
newline newline
textblock "Switches are listed then followed by a description of their effect on the following line. Finally, if a default value exists, it will be listed on the next line in (parentheses)." textblock "Parameters are listed then followed by a description of their effect on the following line. Finally, if a default value exists, it will be listed on the next line in (parentheses)."
newline newline
textblock "${magenta}--- script related parameters ---${norm}" textblock "${magenta}--- script related parameters ---${norm}"
newline newline
@ -182,7 +182,25 @@ scriptHelp() {
textblock "Path to where the 'error 503' file should be copied." textblock "Path to where the 'error 503' file should be copied."
defaultsTextblock "(/usr/share/nginx/html/)" defaultsTextblock "(/usr/share/nginx/html/)"
newline newline
textblock "More details and examples of script usage can be found in the repo wiki at ${yellow}https://git.asifbacchus.app/asif/myGitea/wiki${norm}" textblock "${magenta}--- mailcow related ---${norm}"
newline
switchTextblock "-d | --docker-compose"
textblock "Path to mailcow's 'docker-compose.yml' file."
defaultsTextblock "(/opt/mailcow-dockerized/docker-compose.yml)"
newline
switchTextblock "-m | --mailcow-config"
textblock "Path to mailcow configuration file ('mailcow.conf')."
defaultsTextblock "(/opt/mailcow-dockerized/mailcow.conf)"
newline
switchTextblock "-t1 | --dockerStartTimeout"
textblock "Seconds to wait for docker containers to start."
defaultsTextblock "(180)"
newline
switchTextblock "-t2 | --dockerStopTimeout"
textblock "Seconds to wait for docker containers to stop."
defaultsTextblock "(120)"
newline
textblock "More details and examples of script usage can be found in the repo wiki at ${yellow}https://git.asifbacchus.app/asif/MailcowBackup/wiki${norm}"
newline newline
} }
@ -246,7 +264,7 @@ webroot="/usr/share/nginx/html"
# mailcow/docker related # mailcow/docker related
mcConfig='/opt/mailcow-dockerized/mailcow.conf' mcConfig='/opt/mailcow-dockerized/mailcow.conf'
mcDockerCompose="${mcConfig%/*}/docker-compose.yml" mcDockerCompose="/opt/mailcow-dockerized/docker-compose.yml"
dockerStartTimeout=180 dockerStartTimeout=180
dockerStopTimeout=120 dockerStopTimeout=120
@ -318,10 +336,10 @@ while [ $# -gt 0 ]; do
fi fi
;; ;;
-d|--docker-compose) -d|--docker-compose)
# path to mailcow docker-compose file # FULL path to mailcow docker-compose file
if [ -n "$2" ]; then if [ -n "$2" ]; then
if [ -f "$2" ]; then if [ -f "$2" ]; then
mcDockerCompose="${2%/}" mcDockerCompose="$2"
shift shift
else else
badParam dne "$@" badParam dne "$@"
@ -331,10 +349,10 @@ while [ $# -gt 0 ]; do
fi fi
;; ;;
-m|--mailcow-config) -m|--mailcow-config)
# path to mailcow configuration file # FULL path to mailcow configuration file
if [ -n "$2" ]; then if [ -n "$2" ]; then
if [ -f "$2" ]; then if [ -f "$2" ]; then
mcConfig="${2%/}" mcConfig="$2"
shift shift
else else
badParam dne "$@" badParam dne "$@"