From ebaba8fb411fb4d5aff101242b7ff28ee2ad7671 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 19 Oct 2018 15:27:18 +0300 Subject: [PATCH] Moved variables from docker-compose.yml back to env file --- setup/flavors/compose/docker-compose.yml | 3 --- setup/flavors/compose/mailu.env | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml index 4cebdc2c..c2846e84 100644 --- a/setup/flavors/compose/docker-compose.yml +++ b/setup/flavors/compose/docker-compose.yml @@ -19,9 +19,6 @@ services: image: mailu/nginx:{{ version }} restart: always env_file: {{ env }} - environment: - - TLS_FLAVOR={{ tls_flavor }} - - ADMIN={{ admin_enabled or 'false' }} ports: {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %} {% if bind4 %} diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index 38735c4b..9fc1197d 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -35,7 +35,7 @@ HOSTNAMES={{ hostnames }} POSTMASTER={{ postmaster }} # 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) {% 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) -#ADMIN={{ admin_enabled or 'false' }} +ADMIN={{ admin_enabled or 'false' }} # Choose which webmail to run if any (values: roundcube, rainloop, none) WEBMAIL={{ webmail_type }}