浏览代码

[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

André 7 年之前
父节点
当前提交
c372b01909
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      data/Dockerfiles/rspamd/Dockerfile
  2. 1 1
      data/web/js/admin.js
  3. 1 1
      docker-compose.yml

+ 1 - 1
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

+ 1 - 1
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();

+ 1 - 1
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: