docker
/
docker-mailserver
mirror of https://github.com/tomav/docker-mailserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

correct application of the new SUPERVISOR_LOGLEVEL variable (#1787) 

* correct application of the new SUPERVISOR_LOGLEVEL variable
* correcting default log level adjustment
* replacing grep &>/dev/null with grep -q
This commit is contained in:
Georg Lauterbach 2021-02-01 18:39:05 +01:00 committed by GitHub
parent 27e68640b6
commit 6c575adae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -156,17 +156,17 @@ If you'd like to change, patch or alter files or behavior of `docker-mailserver`
# ! THIS IS AN EXAMPLE !
# If you modify any supervisord configuration, make sure
# to run "supervisorctl update" afterwards.
# to run `supervisorctl update` and/or `supervisorctl reload` afterwards.
set -euo pipefail
echo 'user-patches.sh started'
# shellcheck source=/dev/null
. /usr/local/bin/helper-functions.sh
_notify 'Applying user-patches'
if ! grep '192.168.0.1' /etc/hosts
then
echo -e '192.168.0.1 some.domain.com' >> /etc/hosts
fi
echo 'user-patches.sh finished successfully'
```
And you're done. The user patches script runs right before starting daemons. That means, all the other configuration is in place, so the script can make final adjustments.
@ -224,7 +224,7 @@ This example provides you only with a basic example of what a minimal setup coul
version: '3.8'
services:
mail:
mailserver:
image: docker.io/mailserver/docker-mailserver:latest
hostname: mail # ${HOSTNAME}
domainname: domain.com # ${DOMAINNAME}
@ -265,7 +265,7 @@ volumes:
version: '3.8'
services:
mail:
mailserver:
image: docker.io/mailserver/docker-mailserver:latest
hostname: mail # ${HOSTNAME}
domainname: domain.com # ${DOMAINNAME}

35
target/scripts/start-mailserver.sh
View File

@ -356,22 +356,27 @@ function setup
function _setup_supervisor
{
case ${SUPERVISOR_LOGLEVEL} in
critical | error | warn | info | debug )
sed -i -E \
"s+loglevel.*+loglevel = ${SUPERVISOR_LOGLEVEL}+g" \
/etc/supervisor/supervisord.conf
;;
* )
_notify 'warn' \
"SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'"
sed -i -E \
"s+loglevel.*+loglevel = warn+g" \
/etc/supervisor/supervisord.conf
;;
esac
if ! grep -q "loglevel = ${SUPERVISOR_LOGLEVEL}" /etc/supervisor/supervisord.conf
then
case ${SUPERVISOR_LOGLEVEL} in
critical | error | warn | info | debug )
sed -i -E \
"s+loglevel.*+loglevel = ${SUPERVISOR_LOGLEVEL}+g" \
/etc/supervisor/supervisord.conf
supervisorctl update
;;
* )
_notify 'error' \
"SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'"
sed -i -E \
"s+loglevel.*+loglevel = warn+g" \
/etc/supervisor/supervisord.conf
;;
esac
supervisorctl reload
fi
}
function _setup_default_vars