From f7e37b7d4b4c8aa85920bd9aebf7b78bc3271752 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Fri, 11 Jan 2019 16:25:32 +0200
Subject: [PATCH] Removed unbound resolver for stack flavor

---
 setup/flavors/stack/docker-compose.yml     | 25 ----------------------
 setup/templates/steps/stack/03_expose.html |  7 ------
 2 files changed, 32 deletions(-)

diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index 480aafeb..e1382d20 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -31,15 +31,6 @@ services:
     deploy:
       replicas: {{ front_replicas }}
 
-  {% if resolver_enabled %}
-  resolver:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-{{ version }}}
-    env_file: {{ env }}
-    networks:
-      default:
-        ipv4_address: {{ dns }}
-  {% endif %}
-
   admin:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
     env_file: {{ env }}
@@ -69,10 +60,6 @@ services:
       - "{{ root }}/overrides:/overrides"
     deploy:
       replicas: {{ smtp_replicas }}
-    {% if resolver_enabled %}
-    dns:
-      - {{ dns }}
-    {% endif %}
 
   antispam:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
@@ -83,10 +70,6 @@ services:
       - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
     deploy:
       replicas: 1
-    {% if resolver_enabled %}
-    dns:
-      - {{ dns }}
-    {% endif %}
 
   # Optional services
   {% if antivirus_enabled %}
@@ -97,10 +80,6 @@ services:
       - "{{ root }}/filter:/data"
     deploy:
       replicas: 1
-    {% if resolver_enabled %}
-    dns:
-      - {{ dns }}
-    {% endif %}
   {% endif %}
 
   {% if webdav_enabled %}
@@ -121,10 +100,6 @@ 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 820ff154..5377d3bd 100644
--- a/setup/templates/steps/stack/03_expose.html
+++ b/setup/templates/steps/stack/03_expose.html
@@ -3,13 +3,6 @@
 and let users access their mailboxes. Mailu has some flexibility in the way
 you expose it to the world.</p>
 
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="resolver_enabled" value="true">
-    Enable unbound resolver
-  </label>
-</div>
-
 <div class="form-group">
   <label>Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)</label>
   <input class="form-control" type="text" name="subnet" required pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))$"