mirror of
https://github.com/docker-mailserver/docker-mailserver
synced 2024-05-11 22:56:05 +02:00
a7e6439a39
* fix: Workaround `postconf` write settle logic After updating `main.cf`, to avoid an enforced delay from reading the config by postfix tools, we can ensure the modified time is at least 2 seconds in the past as a workaround. This should be ok with our usage AFAIK. Shaves off 2+ seconds roughly off each container startup, reduces roughly 2+ minutes off tests. * chore: Only modify `mtime` if less than 2 seconds ago - Slight improvement by avoiding unnecessary writes with a conditional check on the util method. - Can more comfortably call this during `postfix reload` in the change detection cycle now. - Identified other tests that'd benefit from this, created a helper method to call instead of copy/paste. - The `setup email restrict` command also did a modification and reload. Added util method here too. * tests(fix): `mail_smtponly.bats` should wait for Postfix - `postfix reload` fails if the service is not ready yet. - `service postfix reload` and `/etc/init.d/postfix reload` presumably wait until it is ready? (as these work regardless) * chore: Review feedback - Move reload method into utilities
94 lines
2.5 KiB
Bash
94 lines
2.5 KiB
Bash
#!/bin/bash
|
|
|
|
function _start_daemons
|
|
{
|
|
_log 'info' 'Starting daemons'
|
|
|
|
for FUNCTION in "${DAEMONS_START[@]}"
|
|
do
|
|
${FUNCTION}
|
|
done
|
|
}
|
|
|
|
function _default_start_daemon
|
|
{
|
|
_log 'debug' "Starting ${1:?}"
|
|
|
|
local RESULT
|
|
RESULT=$(supervisorctl start "${1}" 2>&1)
|
|
|
|
# shellcheck disable=SC2181
|
|
if [[ ${?} -ne 0 ]]
|
|
then
|
|
echo "${RESULT}" >&2
|
|
dms_panic__fail_init "${1}"
|
|
fi
|
|
}
|
|
|
|
function _start_daemon_changedetector { _default_start_daemon 'changedetector' ; }
|
|
function _start_daemon_amavis { _default_start_daemon 'amavis' ; }
|
|
function _start_daemon_clamav { _default_start_daemon 'clamav' ; }
|
|
function _start_daemon_cron { _default_start_daemon 'cron' ; }
|
|
function _start_daemon_opendkim { _default_start_daemon 'opendkim' ; }
|
|
function _start_daemon_opendmarc { _default_start_daemon 'opendmarc' ; }
|
|
function _start_daemon_postsrsd { _default_start_daemon 'postsrsd' ; }
|
|
function _start_daemon_rsyslog { _default_start_daemon 'rsyslog' ; }
|
|
function _start_daemon_update_check { _default_start_daemon 'update-check' ; }
|
|
function _start_daemon_rspamd { _default_start_daemon 'rspamd' ; }
|
|
function _start_daemon_redis { _default_start_daemon 'redis' ; }
|
|
|
|
function _start_daemon_saslauthd
|
|
{
|
|
_default_start_daemon "saslauthd_${SASLAUTHD_MECHANISMS}"
|
|
}
|
|
|
|
function _start_daemon_postfix
|
|
{
|
|
_adjust_mtime_for_postfix_maincf
|
|
_default_start_daemon 'postfix'
|
|
}
|
|
|
|
function _start_daemon_postgrey
|
|
{
|
|
rm -f /var/run/postgrey/postgrey.pid
|
|
_default_start_daemon 'postgrey'
|
|
}
|
|
|
|
function _start_daemon_fail2ban
|
|
{
|
|
touch /var/log/auth.log
|
|
|
|
# delete fail2ban.sock that probably was left here after container restart
|
|
[[ -e /var/run/fail2ban/fail2ban.sock ]] && rm /var/run/fail2ban/fail2ban.sock
|
|
|
|
_default_start_daemon 'fail2ban'
|
|
}
|
|
|
|
function _start_daemon_dovecot
|
|
{
|
|
if [[ ${ENABLE_POP3} -eq 1 ]]
|
|
then
|
|
_log 'debug' 'Enabling POP3 services'
|
|
mv /etc/dovecot/protocols.d/pop3d.protocol.disab /etc/dovecot/protocols.d/pop3d.protocol
|
|
fi
|
|
|
|
[[ -f /tmp/docker-mailserver/dovecot.cf ]] && cp /tmp/docker-mailserver/dovecot.cf /etc/dovecot/local.conf
|
|
|
|
_default_start_daemon 'dovecot'
|
|
}
|
|
|
|
function _start_daemon_fetchmail
|
|
{
|
|
if [[ ${FETCHMAIL_PARALLEL} -eq 1 ]]
|
|
then
|
|
local COUNTER=0
|
|
for _ in /etc/fetchmailrc.d/fetchmail-*.rc
|
|
do
|
|
COUNTER=$(( COUNTER + 1 ))
|
|
_default_start_daemon "fetchmail-${COUNTER}"
|
|
done
|
|
else
|
|
_default_start_daemon 'fetchmail'
|
|
fi
|
|
}
|