Merge remote-tracking branch 'upstream/master' into extend-nginx

This commit is contained in:
Tim Möhlmann
2018-12-07 16:48:50 +02:00
85 changed files with 2283 additions and 645 deletions

View File

@@ -73,6 +73,7 @@ ANTISPAM={{ antispam_enabled or 'none'}}
# Message size limit in bytes
# Default: accept messages up to 50MB
# Max attachment size will be 33% smaller
MESSAGE_SIZE_LIMIT={{ message_size_limit or '50000000' }}
# Networks granted relay permissions, make sure that you include your Docker
@@ -144,7 +145,7 @@ DOMAIN_REGISTRATION=true
# json-file (default)
# journald (On systemd platforms, useful for Fail2Ban integration)
# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!)
LOG_DRIVER={{ log_driver or 'json-file' }}
# LOG_DRIVER={{ log_driver or 'json-file' }}
# Docker-compose project name, this will prepended to containers names.
COMPOSE_PROJECT_NAME={{ compose_project_name or 'mailu' }}