Merge branch 'master' into feature-traefik

2017-09-16 17:54:09 +02:00
parent 9ee795a694 68ba514297
commit a08185911d
27 changed files with 364 additions and 24 deletions
--- a/.env.dist
+++ b/.env.dist
@@ -55,6 +55,9 @@ EXPOSE_ADMIN=no
 # Dav server implementation (value: radicale, none)
 WEBDAV=none

+# Antivirus solution (value: none, clamav)
+ANTIVIRUS=clamav
+
 ###################################
 # Mail settings
 ###################################
@@ -77,6 +80,10 @@ FETCHMAIL_DELAY=600
 # e.g. localpart+custom@domain;tld
 RECIPIENT_DELIMITER=+

+# DMARC rua and ruf email
+DMARC_RUA=admin
+DMARC_RUF=admin
+
 ###################################
 # Nginx settings
 ###################################