Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve VIRUSMAILS_DELETE_DELAY usage (#2281)

This commit is contained in:
Casper 2021-11-01 22:13:14 +01:00 committed by GitHub
parent c7dec1e330
commit b117cd1423
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -30,7 +30,6 @@ ENV POSTGREY_MAX_AGE=35
ENV POSTGREY_TEXT="Delayed by Postgrey" ENV POSTGREY_TEXT="Delayed by Postgrey"
ENV SASLAUTHD_MECHANISMS=pam ENV SASLAUTHD_MECHANISMS=pam
ENV SASLAUTHD_MECH_OPTIONS="" ENV SASLAUTHD_MECH_OPTIONS=""
ENV VIRUSMAILS_DELETE_DELAY=7
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]

5
target/bin/virus-wiper
View File

@ -1,3 +1,8 @@
#! /bin/bash #! /bin/bash
set -e
# shellcheck source=/dev/null
. /etc/dms-settings
find /var/lib/amavis/virusmails/ -type f -mtime +"${VIRUSMAILS_DELETE_DELAY}" -delete find /var/lib/amavis/virusmails/ -type f -mtime +"${VIRUSMAILS_DELETE_DELAY}" -delete

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

@ -140,7 +140,6 @@ function register_functions
[[ ${ENABLE_POSTFIX_VIRTUAL_TRANSPORT:-0} -eq 1 ]] && _register_setup_function '_setup_postfix_virtual_transport' [[ ${ENABLE_POSTFIX_VIRTUAL_TRANSPORT:-0} -eq 1 ]] && _register_setup_function '_setup_postfix_virtual_transport'
_register_setup_function '_setup_postfix_override_configuration' _register_setup_function '_setup_postfix_override_configuration'
_register_setup_function '_setup_environment'
_register_setup_function '_setup_logrotate' _register_setup_function '_setup_logrotate'
_register_setup_function '_setup_mail_summary' _register_setup_function '_setup_mail_summary'
_register_setup_function '_setup_logwatch' _register_setup_function '_setup_logwatch'

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

@ -1720,17 +1720,6 @@ function _setup_user_patches
fi fi
} }
function _setup_environment
{
_notify 'task' 'Setting up /etc/environment'
if ! grep -q "# Docker Mail Server" /etc/environment
then
echo "# Docker Mail Server" >>/etc/environment
echo "VIRUSMAILS_DELETE_DELAY=${VIRUSMAILS_DELETE_DELAY}" >>/etc/environment
fi
}
function _setup_fail2ban function _setup_fail2ban
{ {
_notify 'task' 'Setting up fail2ban' _notify 'task' 'Setting up fail2ban'