From c25ba75d68775c88ae8e9b9019e90c5e6a277b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Fri, 7 Dec 2018 15:29:33 +0200 Subject: [PATCH] Include WEBROOT_REDIRECT in setup templates --- setup/flavors/compose/docker-compose.yml | 3 ++- setup/flavors/compose/mailu.env | 3 +++ setup/flavors/stack/docker-compose.yml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml index 81b6bcb2..1a77b1de 100644 --- a/setup/flavors/compose/docker-compose.yml +++ b/setup/flavors/compose/docker-compose.yml @@ -28,7 +28,8 @@ services: {% endfor %} volumes: - "{{ root }}/certs:/certs" - + - "{{ root }}/overrides/nginx:/overrides" + {% if resolver_enabled %} resolver: image: mailu/unbound:{{ version }} diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index 4a14de63..c7c60fdf 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -110,6 +110,9 @@ COMPRESSION_LEVEL={{ compression_level }} # Web settings ################################### +# Path to redirect / to +WEBROOT_REDIRECT=/webmail + # Path to the admin interface if enabled WEB_ADMIN={{ admin_path }} diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml index b9537e94..6e471f39 100644 --- a/setup/flavors/stack/docker-compose.yml +++ b/setup/flavors/stack/docker-compose.yml @@ -26,9 +26,10 @@ services: {% endfor %} volumes: - "{{ root }}/certs:/certs" + - "{{ root }}/overrides/nginx:/overrides" deploy: replicas: 1 - + {% if resolver_enabled %} resolver: image: mailu/unbound:{{ version }}