mirror/ docker-mailserver
1
1
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver synced 2024-05-05 11:06:04 +02:00
Code Issues

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:
Georg Lauterbach 2021-02-24 10:12:20 +01:00 committed by GitHub
parent 365ecf5935
commit 1ef66fd5c5
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/scripts/startup/fixes-stack.sh
View File

@ -25,6 +25,8 @@ function _fix_var_mail_permissions
else
_notify 'inf' 'Permissions in /var/mail look OK'
fi
return 0
}
function _fix_var_amavis_permissions

7
target/scripts/startup/setup-stack.sh
View File

@ -21,7 +21,7 @@ function _setup_supervisor
;;
* )
_notify 'error' \
_notify 'err' \
"SUPERVISOR_LOGLEVEL value '${SUPERVISOR_LOGLEVEL}' unknown. Defaulting to 'warn'"
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."
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
if [[ ${ENABLE_LDAP} -eq 0 ]]
then
@ -749,7 +749,7 @@ function _setup_dkim
{
_notify 'task' 'Setting up DKIM'
mkdir -p /etc/opendkim
mkdir -p /etc/opendkim && touch /etc/opendkim/SigningTable
# check if any keys are available
if [[ -e "/tmp/docker-mailserver/opendkim/KeyTable" ]]
@ -763,6 +763,7 @@ function _setup_dkim
chmod -R 0700 /etc/opendkim/keys/
else
_notify 'warn' 'No DKIM key provided. Check the documentation on how to get your keys.'
[[ ! -f "/etc/opendkim/KeyTable" ]] && touch "/etc/opendkim/KeyTable"
fi
# setup nameservers paramater from /etc/resolv.conf if not defined