From c372b0190990995c07009c8c40133c37cbf9ecf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Fri, 13 Jul 2018 11:37:37 +0200
Subject: [PATCH] [Rspamd] Use old ratelimit LUA until custom rl is fixed [Web]
 Updated settings preset: Ratelimit was NOT applied when preset for settings
 map was used (added "RATELIMIT_UPDATE", "RATELIMIT_CHECK" to symbols_enabled)
 [Rspamd] v1.7.8

---
 data/Dockerfiles/rspamd/Dockerfile | 2 +-
 data/web/js/admin.js               | 2 +-
 docker-compose.yml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 899bacb9..e5172bf0 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y \
 	&& chown _rspamd:_rspamd /run/rspamd
 
 COPY settings.conf /etc/rspamd/modules.d/settings.conf
-#COPY ratelimit.lua /usr/share/rspamd/lua/ratelimit.lua
+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
 COPY tini /sbin/tini
diff --git a/data/web/js/admin.js b/data/web/js/admin.js
index 389a24c4..72a5c3bb 100644
--- a/data/web/js/admin.js
+++ b/data/web/js/admin.js
@@ -12,7 +12,7 @@ jQuery(function($){
   $("#rspamd_preset_1").on('click', function(e) {
     e.preventDefault();
     $("form[data-id=rsetting]").find("#desc").val(lang.rsettings_preset_1);
-    $("form[data-id=rsetting]").find("#content").val('priority = 10;\nauthenticated = yes;\napply "default" {\n  symbols_enabled = ["DKIM_SIGNED", "DYN_RL_CHECK", "HISTORY_SAVE", "MILTER_HEADERS", "ARC_SIGNED"];\n}');
+    $("form[data-id=rsetting]").find("#content").val('priority = 10;\nauthenticated = yes;\napply "default" {\n  symbols_enabled = ["DKIM_SIGNED", "RATELIMIT_UPDATE", "RATELIMIT_CHECK", "DYN_RL_CHECK", "HISTORY_SAVE", "MILTER_HEADERS", "ARC_SIGNED"];\n}');
   });
   $("#rspamd_preset_2").on('click', function(e) {
     e.preventDefault();
diff --git a/docker-compose.yml b/docker-compose.yml
index 50e80f36..cf747434 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,7 +78,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.21
+      image: mailcow/rspamd:1.22
       build: ./data/Dockerfiles/rspamd
       stop_grace_period: 30s
       depends_on: