Added minor changes

This commit is contained in:
Ionut Filip
2018-10-16 18:03:59 +03:00
parent e8dee22ecf
commit b9ecc0ccc6
4 changed files with 33 additions and 24 deletions

View File

@@ -19,8 +19,8 @@ services:
restart: always
env_file: {{ env }}
env:
- TLS_FLAVOR={{ tls_flavor or 'letsencrypt' }}
- ADMIN={{ expose_admin or 'no' }}
- TLS_FLAVOR={{ tls_flavor }}
- ADMIN={{ admin_enabled or 'no' }}
ports:
{% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
{% if bind4 %}
@@ -39,7 +39,7 @@ services:
image: mailu/admin:{{ version }}
restart: always
env_file: {{ env }}
{% if not expose_admin %}
{% if not admin_enabled %}
ports:
- 127.0.0.1:8080:80
{% endif %}
@@ -102,7 +102,7 @@ services:
- "{{ root }}/dav:/data"
{% endif %}
{% if enable_fetchmail %}
{% if fetchmail_enabled %}
fetchmail:
image: mailu/fetchmail:{{ version }}
restart: always
@@ -114,7 +114,7 @@ services:
# Webmail
{% if webmail_enabled %}
webmail:
image: mailu/{{ webmail }}:{{ version }}
image: mailu/{{ webmail_type }}:{{ version }}
restart: always
env_file: {{ env }}
volumes:

View File

@@ -33,7 +33,8 @@ POSTMASTER={{ postmaster or 'admin'}}
HOSTNAMES={{ hostnames }}
# Authentication rate limit (per source IP address)
AUTH_RATELIMIT={{ auth_ratelimit }}
AUTH_RATELIMIT={% if auth_ratelimit_pm %}{{ auth_ratelimit_pm }}/minute;{% endif %}
{% if auth_ratelimit_ph %}{{ auth_ratelimit_ph }}/hour{% endif %}
# Opt-out of statistics, replace with "True" to opt out
DISABLE_STATISTICS={{ disable_statistics or 'False' }}
@@ -43,20 +44,20 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
###################################
#Expose the admin interface
ADMIN={{ admin_enabled or 'false' }}
#ADMIN={{ admin_enabled or 'false' }}
#Chose which webmail to run if any
#WEBMAIL_ENABLED={{ webmail_enabled or 'false' }}
WEBMAIL={{ webmail_type or 'none' }}
#WEBMAIL={{ webmail_type or 'none' }}
#Antivirus solution
ANTIVIRUS={{ antivirus_enabled or 'none' }}
#ANTIVIRUS={{ antivirus_enabled or 'none' }}
#Antispam solution
#ANTISPAM={{ antispam_enabled or 'none'}}
#Dav server implementation
WEBDAV={{ webdav_enabled or 'none' }}
#WEBDAV={{ webdav_enabled or 'none' }}
###################################
# Server behavior