Revert "[Fix] Fix history key, as we use `{=` and not `{{` in templates"

diff --git a/conf/modules.d/history_redis.conf b/conf/modules.d/history_redis.conf
index 141f9df328583af0c96d82dee261aeefeadfb597..b55d2fbbafc97d8929ee2e588199b8b4fae1dde0 100644 (file)
--- a/conf/modules.d/history_redis.conf
+++ b/conf/modules.d/history_redis.conf
@@ -14,7 +14,7 @@
 
 history_redis {
   #servers = 127.0.0.1:6379; # Redis server to store history
-  key_prefix = "rs_history{=HOSTNAME=}{=COMPRESS=}"; # Default key name template
+  key_prefix = "rs_history{{HOSTNAME}}{{COMPRESS}}"; # Default key name template
   nrows = 200; # Default rows limit
   compress = true; # Use zstd compression when storing data in redis
   subject_privacy = false; # subject privacy is off

diff --git a/lualib/lua_util.lua b/lualib/lua_util.lua
index 07ab13c9ca1c25185b7252b5069e3480f3334b7b..6964b0f0035a961a542ed8795d2de2ee6b9e6b55 100644 (file)
--- a/lualib/lua_util.lua
+++ b/lualib/lua_util.lua
@@ -171,7 +171,7 @@ end
 -- @param {boolean} skip_global_env don't export Rspamd superglobals
 -- @return {string} string containing replaced values
 -- @example
--- lua_util.jinja_template("HELLO {=FOO=} {=BAR=}!", {['FOO'] = 'LUA', ['BAR'] = 'WORLD'})
+-- lua_util.jinja_template("HELLO {{FOO}} {{BAR}}!", {['FOO'] = 'LUA', ['BAR'] = 'WORLD'})
 -- "HELLO LUA WORLD!"
 --]]
 exports.jinja_template = function(text, env, skip_global_env)
@@ -190,7 +190,7 @@ end
 -- @param {boolean} skip_global_env don't export Rspamd superglobals
 -- @return {string} string containing replaced values
 -- @example
--- lua_util.jinja_template("HELLO {=FOO=} {=BAR=}!", {['FOO'] = 'LUA', ['BAR'] = 'WORLD'})
+-- lua_util.jinja_template("HELLO {{FOO}} {{BAR}}!", {['FOO'] = 'LUA', ['BAR'] = 'WORLD'})
 -- "HELLO LUA WORLD!"
 --]]
 exports.jinja_template_file = function(filename, env, skip_global_env)

diff --git a/src/plugins/lua/history_redis.lua b/src/plugins/lua/history_redis.lua
index 1a6d107053682d7a61244d29319835e6cd76b169..f2554ef93de9e6b8bf893bdcd7ab250c5edadb01 100644 (file)
--- a/src/plugins/lua/history_redis.lua
+++ b/src/plugins/lua/history_redis.lua
@@ -57,7 +57,7 @@ local template_env = {
 local redis_params
 
 local settings = {
-  key_prefix = 'rs_history{=HOSTNAME=}{=COMPRESS=}', -- default key name template
+  key_prefix = 'rs_history{{HOSTNAME}}{{COMPRESS}}', -- default key name template
   expire = nil, -- default no expire
   nrows = 200, -- default rows limit
   compress = true, -- use zstd compression when storing data in redis