mirror of
https://github.com/docker-mailserver/docker-mailserver
synced 2024-05-18 19:56:04 +02:00
first (may-be) fixes for v9.0.0 startup problems (#1835)
* first (may-be) fixes for v9.0.0 startup problems * adjust grep showing an error when it shouldn't
This commit is contained in:
parent
365ecf5935
commit
1ef66fd5c5
|
@ -25,6 +25,8 @@ function _fix_var_mail_permissions
|
||||||
else
|
else
|
||||||
_notify 'inf' 'Permissions in /var/mail look OK'
|
_notify 'inf' 'Permissions in /var/mail look OK'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function _fix_var_amavis_permissions
|
function _fix_var_amavis_permissions
|
||||||
|
|
|
@ -21,7 +21,7 @@ function _setup_supervisor
|
||||||
;;
|
;;
|
||||||
|
|
||||||
* )
|
* )
|
||||||
_notify 'error' \
|
_notify 'err' \
|
||||||
"SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'"
|
"SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'"
|
||||||
|
|
||||||
sed -i -E \
|
sed -i -E \
|
||||||
|
@ -382,7 +382,7 @@ function _setup_dovecot_local_user
|
||||||
_notify 'inf' "'config/docker-mailserver/postfix-accounts.cf' is not provided. No mail account created."
|
_notify 'inf' "'config/docker-mailserver/postfix-accounts.cf' is not provided. No mail account created."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! grep '@' /tmp/docker-mailserver/postfix-accounts.cf | grep -q '|'
|
if ! grep '@' /tmp/docker-mailserver/postfix-accounts.cf 2>/dev/null | grep -q '|'
|
||||||
then
|
then
|
||||||
if [[ ${ENABLE_LDAP} -eq 0 ]]
|
if [[ ${ENABLE_LDAP} -eq 0 ]]
|
||||||
then
|
then
|
||||||
|
@ -749,7 +749,7 @@ function _setup_dkim
|
||||||
{
|
{
|
||||||
_notify 'task' 'Setting up DKIM'
|
_notify 'task' 'Setting up DKIM'
|
||||||
|
|
||||||
mkdir -p /etc/opendkim
|
mkdir -p /etc/opendkim && touch /etc/opendkim/SigningTable
|
||||||
|
|
||||||
# check if any keys are available
|
# check if any keys are available
|
||||||
if [[ -e "/tmp/docker-mailserver/opendkim/KeyTable" ]]
|
if [[ -e "/tmp/docker-mailserver/opendkim/KeyTable" ]]
|
||||||
|
@ -763,6 +763,7 @@ function _setup_dkim
|
||||||
chmod -R 0700 /etc/opendkim/keys/
|
chmod -R 0700 /etc/opendkim/keys/
|
||||||
else
|
else
|
||||||
_notify 'warn' 'No DKIM key provided. Check the documentation on how to get your keys.'
|
_notify 'warn' 'No DKIM key provided. Check the documentation on how to get your keys.'
|
||||||
|
[[ ! -f "/etc/opendkim/KeyTable" ]] && touch "/etc/opendkim/KeyTable"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# setup nameservers paramater from /etc/resolv.conf if not defined
|
# setup nameservers paramater from /etc/resolv.conf if not defined
|
||||||
|
|
Loading…
Reference in New Issue