Merge branch 'master' into feat-setup

setup/flavors/stack/docker-compose.yml

@@ -29,6 +29,15 @@ services:
       - "{{ root }}/certs:/certs"
     deploy:
       replicas: {{ front_replicas }}
+      
+  {% if resolver_enabled %}
+  resolver:
+    image: mailu/unbound:{{ version }}
+    env_file: {{ env }}
+    networks:
+      default:
+        ipv4_address: {{ dns }}
+  {% endif %}
 
   admin:
     image: ${DOCKER_ORG:-mailu}/admin:${MAILU_VERSION:-{{ version }}}
@@ -64,6 +73,10 @@ services:
       - "{{ root }}/overrides:/overrides"
     deploy:
       replicas: {{ smtp_replicas }}
+    {% if resolver_enabled %}
+    dns:
+      - {{ dns }}
+    {% endif %}
 
   antispam:
     image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
@@ -76,6 +89,10 @@ services:
       - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
     deploy:
       replicas: 1
+    {% if resolver_enabled %}
+    dns:
+      - {{ dns }}
+    {% endif %}
 
   # Optional services
   {% if antivirus_enabled %}
@@ -86,6 +103,10 @@ services:
       - "{{ root }}/filter:/data"
     deploy:
       replicas: 1
+    {% if resolver_enabled %}
+    dns:
+      - {{ dns }}
+    {% endif %}
   {% endif %}
 
   {% if webdav_enabled %}
@@ -106,6 +127,10 @@ services:
       - "{{ root }}/data:/data"
     deploy:
       replicas: 1
+    {% if resolver_enabled %}
+    dns:
+      - {{ dns }}
+    {% endif %}
   {% endif %}
 
   {% if webmail_type != 'none' %}