From 6b6cbcf977002f768827389f035ab45fde1c4c15 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Wed, 17 Oct 2018 15:38:51 +0300 Subject: [PATCH] Modified variables in .env file --- setup/flavors/compose/mailu.env | 27 ++++++++++++++--------- setup/templates/steps/compose/config.html | 2 +- setup/templates/steps/compose/expose.html | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index 77da5670..a577f979 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -65,26 +65,24 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }} # Message size limit in bytes # Default: accept messages up to 50MB -MESSAGE_SIZE_LIMIT={{ message_size_limit }} +MESSAGE_SIZE_LIMIT={{ message_size_limit or '50000000' }} # Networks granted relay permissions, make sure that you include your Docker # internal network (default to 172.17.0.0/16) -RELAYNETS={{ relaynets }} +RELAYNETS={{ relaynets or '172.17.0.0/16'}} # Will relay all outgoing mails if configured RELAYHOST={{ relayhost }} # Fetchmail delay -FETCHMAIL_DELAY={{ fetchmail_delay }} +FETCHMAIL_DELAY={{ fetchmail_delay or '600' }} # Recipient delimiter, character used to delimiter localpart from custom address part -RECIPIENT_DELIMITER={{ recipient_delimiter }} +RECIPIENT_DELIMITER={{ recipient_delimiter or '+' }} -{% if dmarc_rua or dmarc_ruf %} # DMARC rua and ruf email -{% if dmarc_rua %}DMARC_RUA={{ dmarc_rua }}{% endif %} -{% if dmarc_ruf %}DMARC_RUF={{ dmarc_ruf }}{% endif %} -{% endif %} +DMARC_RUA={{ dmarc_rua or 'admin' }} +DMARC_RUF={{ dmarc_ruf or 'admin' }} {% if welcome_enabled %} # Welcome email, enable and set a topic and body if you wish to send welcome @@ -94,6 +92,12 @@ WELCOME_SUBJECT={{ welcome_subject }} WELCOME_BODY={{ welcome_body }} {% endif %} +# Maildir Compression +# choose compression-method, default: none (value: bz2, gz) +COMPRESSION={{ compression }} +# change compression-level, default: 6 (value: 1-9) +COMPRESSION_LEVEL={{ compression_level }} + {% if domain_registration %} # Domain registration (remove to disable) DOMAIN_REGISTRATION=true @@ -125,13 +129,14 @@ WEBSITE={{ website }} # Advanced settings ################################### -{% if password_scheme %} # Specific password storage scheme -PASSWORD_SCHEME={{ password_scheme }} -{% endif %} +PASSWORD_SCHEME={{ password_scheme or 'SHA512-CRYPT'}} # Header to take the real ip from REAL_IP_HEADER={{ real_ip_header }} # IPs for nginx set_real_ip_from (CIDR list separated by commas) REAL_IP_FROM={{ real_ip_from }} + +# choose wether mailu bounces (no) or rejects (yes) mail when recipient is unknown (value: yes, no) +REJECT_UNLISTED_RECIPIENT={{ reject_unlisted_recipient }} diff --git a/setup/templates/steps/compose/config.html b/setup/templates/steps/compose/config.html index f5a39a5a..8d613d08 100644 --- a/setup/templates/steps/compose/config.html +++ b/setup/templates/steps/compose/config.html @@ -1,4 +1,4 @@ -{% call macros.panel("info", "Step 0 - Initial configuration") %} +{% call macros.panel("info", "Step 2 - Initial configuration") %}

Before starting some variables must be st

diff --git a/setup/templates/steps/compose/expose.html b/setup/templates/steps/compose/expose.html index e0aa8fee..6bc2f528 100644 --- a/setup/templates/steps/compose/expose.html +++ b/setup/templates/steps/compose/expose.html @@ -1,4 +1,4 @@ -{% call macros.panel("info", "Step 2 - expose Mailu to the world") %} +{% call macros.panel("info", "Step 4 - expose Mailu to the world") %}

A mail server must be exposed to the world to receive emails, send emails, and let users access their mailboxes. Mailu has some flexibility in the way you expose it to the world.