From 120c29eff603850d8bb9573df1ddbc8edc4a56b5 Mon Sep 17 00:00:00 2001
From: Ionut Filip
Date: Tue, 23 Oct 2018 17:46:06 +0300
Subject: [PATCH] Added unbound for stack flavor
---
setup/flavors/compose/docker-compose.yml | 4 ++--
setup/flavors/stack/docker-compose.yml | 25 ++++++++++++++++++++++
setup/templates/steps/stack/03_expose.html | 7 ++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index e6b64077..50fd1705 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -29,7 +29,7 @@ services:
volumes:
- "{{ root }}/certs:/certs"
- {% if resolver_enabled %}
+ {% if resolver_enabled %}
resolver:
image: mailu/unbound:{{ version }}
env_file: {{ env }}
@@ -68,7 +68,7 @@ services:
- "{{ root }}/overrides:/overrides"
depends_on:
- front
- {% if resolver_enabled %}
+ {% if resolver_enabled %}
- resolver
dns:
- {{ dns }}
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index f27b661f..b9537e94 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -28,6 +28,15 @@ services:
- "{{ root }}/certs:/certs"
deploy:
replicas: 1
+
+ {% if resolver_enabled %}
+ resolver:
+ image: mailu/unbound:{{ version }}
+ env_file: {{ env }}
+ networks:
+ default:
+ ipv4_address: {{ dns }}
+ {% endif %}
admin:
image: mailu/admin:{{ version }}
@@ -63,6 +72,10 @@ services:
- "{{ root }}/overrides:/overrides"
deploy:
replicas: 1
+ {% if resolver_enabled %}
+ dns:
+ - {{ dns }}
+ {% endif %}
# Optional services
{% if antispam_enabled %}
@@ -77,6 +90,10 @@ services:
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
deploy:
replicas: 1
+ {% if resolver_enabled %}
+ dns:
+ - {{ dns }}
+ {% endif %}
{% endif %}
{% if antivirus_enabled %}
@@ -87,6 +104,10 @@ services:
- "{{ root }}/filter:/data"
deploy:
replicas: 1
+ {% if resolver_enabled %}
+ dns:
+ - {{ dns }}
+ {% endif %}
{% endif %}
{% if webdav_enabled %}
@@ -107,6 +128,10 @@ services:
- "{{ root }}/data:/data"
deploy:
replicas: 1
+ {% if resolver_enabled %}
+ dns:
+ - {{ dns }}
+ {% endif %}
{% endif %}
{% if webmail_type != 'none' %}
diff --git a/setup/templates/steps/stack/03_expose.html b/setup/templates/steps/stack/03_expose.html
index 1cd0cde5..d47390be 100644
--- a/setup/templates/steps/stack/03_expose.html
+++ b/setup/templates/steps/stack/03_expose.html
@@ -3,6 +3,13 @@
and let users access their mailboxes. Mailu has some flexibility in the way
you expose it to the world.
+
+
+
+