From 1e3392e4175ff41d0dfc61c8fba40914e7d179ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Thu, 25 Oct 2018 17:37:22 +0300
Subject: [PATCH] Antispam not an optional service, postfix fails without it

---
 setup/flavors/compose/docker-compose.yml       | 4 +---
 setup/flavors/stack/docker-compose.yml         | 4 +---
 setup/templates/steps/compose/02_services.html | 6 ------
 setup/templates/steps/stack/02_services.html   | 6 ------
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 14eeba3..f2cbad2 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -66,8 +66,6 @@ services:
     depends_on:
       - front
 
-  # Optional services
-  {% if antispam_enabled %}
   antispam:
     image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
     restart: always
@@ -78,8 +76,8 @@ services:
       - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
     depends_on:
       - front
-  {% endif %}
 
+  # Optional services
   {% if antivirus_enabled %}
   antivirus:
     image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index 92a156c..dd9ed7d 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -65,8 +65,6 @@ services:
     deploy:
       replicas: {{ smtp_replicas }}
 
-  # Optional services
-  {% if antispam_enabled %}
   antispam:
     image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
     env_file: {{ env }}
@@ -78,8 +76,8 @@ services:
       - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
     deploy:
       replicas: 1
-  {% endif %}
 
+  # Optional services
   {% if antivirus_enabled %}
   antivirus:
     image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}
diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html
index 7117c49..424b22d 100644
--- a/setup/templates/steps/compose/02_services.html
+++ b/setup/templates/steps/compose/02_services.html
@@ -32,12 +32,6 @@ will prevent Mailu from doing spam filtering, virus filtering, and from applying
 white and blacklists that you may configure in the admin interface. You may
 also disable the antivirus if required (it does use aroung 1GB of ram).</p>
 
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd" checked>
-    Enable the spam filtering service
-  </label>
-</div>
 <div class="form-check form-check-inline">
   <label class="form-check-label">
     <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">
diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html
index 7117c49..424b22d 100644
--- a/setup/templates/steps/stack/02_services.html
+++ b/setup/templates/steps/stack/02_services.html
@@ -32,12 +32,6 @@ will prevent Mailu from doing spam filtering, virus filtering, and from applying
 white and blacklists that you may configure in the admin interface. You may
 also disable the antivirus if required (it does use aroung 1GB of ram).</p>
 
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd" checked>
-    Enable the spam filtering service
-  </label>
-</div>
 <div class="form-check form-check-inline">
   <label class="form-check-label">
     <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">