docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved variables from docker-compose.yml back to env file

Browse Source
This commit is contained in:
Ionut Filip
2018-10-19 15:27:18 +03:00
parent 9c56e4c1b6
commit ebaba8fb41
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/flavors/compose/docker-compose.yml
View File

@@ -19,9 +19,6 @@ services:
image: mailu/nginx:{{ version }} image: mailu/nginx:{{ version }}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
environment:
- TLS_FLAVOR={{ tls_flavor }}
- ADMIN={{ admin_enabled or 'false' }}
ports: ports:
{% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %} {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
{% if bind4 %} {% if bind4 %}

4
setup/flavors/compose/mailu.env
View File

@@ -35,7 +35,7 @@ HOSTNAMES={{ hostnames }}
POSTMASTER={{ postmaster }} POSTMASTER={{ postmaster }}
# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt) # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
#TLS_FLAVOR={{ tls_flavor }} TLS_FLAVOR={{ tls_flavor }}
# Authentication rate limit (per source IP address) # Authentication rate limit (per source IP address)
{% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %} {% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %}
@@ -50,7 +50,7 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
################################### ###################################
# Expose the admin interface (value: true, false) # Expose the admin interface (value: true, false)
#ADMIN={{ admin_enabled or 'false' }} ADMIN={{ admin_enabled or 'false' }}
# Choose which webmail to run if any (values: roundcube, rainloop, none) # Choose which webmail to run if any (values: roundcube, rainloop, none)
WEBMAIL={{ webmail_type }} WEBMAIL={{ webmail_type }}