Merge branch 'dev'

data/Dockerfiles/rspamd/Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y \
 	&& mkdir -p /run/rspamd \
 	&& chown _rspamd:_rspamd /run/rspamd
 
-#COPY settings.conf /etc/rspamd/modules.d/settings.conf
+COPY settings.conf /etc/rspamd/modules.d/settings.conf
 #COPY ratelimit.lua /usr/share/rspamd/lua/ratelimit.lua
 #COPY lua_util.lua /usr/share/rspamd/lib/lua_util.lua
 COPY docker-entrypoint.sh /docker-entrypoint.sh

docker-compose.yml

@@ -75,7 +75,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.7
+      image: mailcow/rspamd:1.8
       build: ./data/Dockerfiles/rspamd
       command: "/usr/bin/rspamd -f -u _rspamd -g _rspamd"
       depends_on: