mirror/docker-mailserver.docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2025-08-30 23:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

patching the delmailuser script to function properly (+ refactoring)

Browse source
This commit is contained in:
Georg Lauterbach 2021-02-14 21:19:58 +01:00
parent 5a806b9934
commit 227719ee0d
No known key found for this signature in database
GPG key ID: 2FDC58699AF121C6
2 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

13
target/scripts/start-mailserver.sh
View file

@ -86,7 +86,6 @@ function register_functions
################### >> check funcs
_register_check_function "_check_environment_variables"
_register_check_function "_check_hostname"
################### >> setup funcs
@ -308,7 +307,7 @@ function check
function _check_hostname
{
_notify "task" "Check that hostname/domainname is provided or overridden (no default docker hostname/kubernetes) [in ${FUNCNAME[0]}]"
_notify "task" "Check that hostname/domainname is provided or overridden [in ${FUNCNAME[0]}]"
if [[ -n ${OVERRIDE_HOSTNAME} ]]
then
@ -319,21 +318,13 @@ function _check_hostname
_notify 'inf' "Domain has been set to ${DOMAINNAME}"
_notify 'inf' "Hostname has been set to ${HOSTNAME}"
if ( ! grep -E '^(\S+[.]\S+)$' <<< "${HOSTNAME}" >/dev/null )
if ! grep -q -E '^(\S+[.]\S+)$' <<< "${HOSTNAME}"
then
_notify 'err' "Setting hostname/domainname is required"
kill "$(< /var/run/supervisord.pid)" && return 1
else
return 0
fi
}
function _check_environment_variables
{
_notify "task" "Check that there are no conflicts with env variables [in ${FUNCNAME[0]}]"
return 0
}
##########################################################################
# << Check Stack
##########################################################################