docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Antispam not an optional service, postfix fails without it

Browse Source
This commit is contained in:
Tim Möhlmann
2018-10-25 17:37:22 +03:00
parent dde7ccca97
commit 1e3392e417
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/flavors/compose/docker-compose.yml
View File

@@ -66,8 +66,6 @@ services:
depends_on: depends_on:
- front - front
# Optional services
{% if antispam_enabled %}
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
restart: always restart: always
@@ -78,8 +76,8 @@ services:
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d" - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
depends_on: depends_on:
- front - front
{% endif %}
# Optional services
{% if antivirus_enabled %} {% if antivirus_enabled %}
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}

4
setup/flavors/stack/docker-compose.yml
View File

@@ -65,8 +65,6 @@ services:
deploy: deploy:
replicas: {{ smtp_replicas }} replicas: {{ smtp_replicas }}
# Optional services
{% if antispam_enabled %}
antispam: antispam:
image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/rspamd:${MAILU_VERSION:-{{ version }}}
env_file: {{ env }} env_file: {{ env }}
@@ -78,8 +76,8 @@ services:
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d" - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
deploy: deploy:
replicas: 1 replicas: 1
{% endif %}
# Optional services
{% if antivirus_enabled %} {% if antivirus_enabled %}
antivirus: antivirus:
image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}} image: ${DOCKER_ORG:-mailu}/clamav:${MAILU_VERSION:-{{ version }}}

6
setup/templates/steps/compose/02_services.html
View File

@@ -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 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> 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"> <div class="form-check form-check-inline">
<label class="form-check-label"> <label class="form-check-label">
<input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav"> <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">

6
setup/templates/steps/stack/02_services.html
View File

@@ -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 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> 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"> <div class="form-check form-check-inline">
<label class="form-check-label"> <label class="form-check-label">
<input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav"> <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">