[Refactor] Rename all lua libraries in the common way

lualib/global_functions.lua

@@ -17,8 +17,8 @@ limitations under the License.
 local logger = require "rspamd_logger"
 local lua_util = require "lua_util"
 local lua_redis = require "lua_redis"
-local meta_functions = require "meta_functions"
-local maps = require "maps"
+local meta_functions = require "lua_meta"
+local maps = require "lua_maps"
 
 local exports = {}
 

lualib/rspamadm/configwizard.lua

@@ -19,7 +19,7 @@ local local_conf = rspamd_paths['CONFDIR']
 local rspamd_util = require "rspamd_util"
 local rspamd_logger = require "rspamd_logger"
 local lua_util = require "lua_util"
-local lua_stat_tools = require "stat_tools"
+local lua_stat_tools = require "lua_stat"
 local lua_redis = require "lua_redis"
 local ucl = require "ucl"
 

lualib/rspamadm/stat_convert.lua

@@ -1,5 +1,5 @@
 local lua_redis = require "lua_redis"
-local stat_tools = require "stat_tools"
+local stat_tools = require "lua_stat"
 local ucl = require "ucl"
 local logger = require "rspamd_logger"
 

src/libserver/cfg_rcl.c

@@ -3549,7 +3549,7 @@ rspamd_rcl_maybe_apply_lua_transform (struct rspamd_config *cfg)
 	gint err_idx, ret;
 	GString *tb;
 	gchar str[PATH_MAX];
-	static const char *transform_script = "rspamd_config_transform";
+	static const char *transform_script = "lua_cfg_transform";
 
 	g_assert (L != NULL);
 

src/plugins/lua/arc.lua

@@ -16,12 +16,12 @@ limitations under the License.
 
 local rspamd_logger = require "rspamd_logger"
 local lua_util = require "lua_util"
-local dkim_sign_tools = require "dkim_sign_tools"
+local dkim_sign_tools = require "lua_dkim_tools"
 local rspamd_util = require "rspamd_util"
 local rspamd_rsa_privkey = require "rspamd_rsa_privkey"
 local rspamd_rsa = require "rspamd_rsa"
 local fun = require "fun"
-local auth_results = require "auth_results"
+local auth_results = require "lua_auth_results"
 local hash = require "rspamd_cryptobox_hash"
 
 if confighelp then

src/plugins/lua/dkim_signing.lua

@@ -17,7 +17,7 @@ limitations under the License.
 
 local lutil = require "lua_util"
 local rspamd_logger = require "rspamd_logger"
-local dkim_sign_tools = require "dkim_sign_tools"
+local dkim_sign_tools = require "lua_dkim_tools"
 local rspamd_util = require "rspamd_util"
 
 if confighelp then

src/plugins/lua/fann_redis.lua

@@ -27,7 +27,7 @@ local rspamd_util = require "rspamd_util"
 local rspamd_redis = require "lua_redis"
 local lua_util = require "lua_util"
 local fun = require "fun"
-local meta_functions = require "meta_functions"
+local meta_functions = require "lua_meta"
 local use_torch = false
 local torch
 local nn

src/plugins/lua/milter_headers.lua

@@ -350,7 +350,7 @@ local function milter_headers(task)
 
   routines['authentication-results'] = function()
     if skip_wanted('authentication-results') then return end
-    local ar = require "auth_results"
+    local ar = require "lua_auth_results"
 
     if settings.routines['authentication-results'].remove then
       remove[settings.routines['authentication-results'].header] =

src/plugins/lua/ratelimit.lua

@@ -50,7 +50,7 @@ local rspamd_util = require "rspamd_util"
 local rspamd_lua_utils = require "lua_util"
 local lua_redis = require "lua_redis"
 local fun = require "fun"
-local lua_maps = require "maps"
+local lua_maps = require "lua_maps"
 local lua_util = require "lua_util"
 
 local user_keywords = {'user'}

src/plugins/lua/reputation.lua

@@ -26,7 +26,7 @@ local N = 'reputation'
 local rspamd_logger = require "rspamd_logger"
 local rspamd_util = require "rspamd_util"
 local lua_util = require "lua_util"
-local lua_maps = require "maps"
+local lua_maps = require "lua_maps"
 local hash = require 'rspamd_cryptobox_hash'
 local fun = require "fun"
 local redis_params = nil

src/plugins/lua/settings.lua

@@ -23,7 +23,7 @@ end
 -- https://rspamd.com/doc/configuration/settings.html
 
 local rspamd_logger = require "rspamd_logger"
-local rspamd_maps = require "maps"
+local rspamd_maps = require "lua_maps"
 local redis_params
 
 local settings = {}