Merge branch 'master' into fix-swarm-start

2018-10-06 23:48:32 +03:00
parent cc8e15748b 011f4e317b
commit d6c386651d
28 changed files with 563 additions and 43 deletions
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
@@ -12,4 +12,6 @@ RUN sed -i '/fuzzy/,$d' /etc/rspamd/rspamd.conf

 EXPOSE 11332/tcp 11334/tcp

+VOLUME ["/var/lib/rspamd"]
+
 CMD /start.py
--- a/services/rspamd/conf/arc.conf
+++ b/services/rspamd/conf/arc.conf
@@ -0,0 +1,4 @@
+try_fallback = true;
+path = "/dkim/$domain.$selector.key";
+selector = "dkim"
+use_esld = false;