aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-02-23 13:20:14 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2018-02-23 13:20:14 +0000
commiteb75c68f30b346b352e69eae90c363c8ef113175 (patch)
tree4a48cfb4654e5b97f9ec2b93c5c7adc5e47e649a
parent24aec6cd1d0fc0ebbf7baa0f0b78a858e16b5ce1 (diff)
downloadrspamd-eb75c68f30b346b352e69eae90c363c8ef113175.tar.gz
rspamd-eb75c68f30b346b352e69eae90c363c8ef113175.zip
[Refactor] Rename all lua libraries in the common way
-rw-r--r--lualib/global_functions.lua4
-rw-r--r--lualib/lua_auth_results.lua (renamed from lualib/auth_results.lua)0
-rw-r--r--lualib/lua_cfg_transform.lua (renamed from lualib/rspamd_config_transform.lua)0
-rw-r--r--lualib/lua_dkim_tools.lua (renamed from lualib/dkim_sign_tools.lua)0
-rw-r--r--lualib/lua_maps.lua (renamed from lualib/maps.lua)0
-rw-r--r--lualib/lua_meta.lua (renamed from lualib/meta_functions.lua)0
-rw-r--r--lualib/lua_stat.lua (renamed from lualib/stat_tools.lua)0
-rw-r--r--lualib/rspamadm/configwizard.lua2
-rw-r--r--lualib/rspamadm/stat_convert.lua2
-rw-r--r--src/libserver/cfg_rcl.c2
-rw-r--r--src/plugins/lua/arc.lua4
-rw-r--r--src/plugins/lua/dkim_signing.lua2
-rw-r--r--src/plugins/lua/fann_redis.lua2
-rw-r--r--src/plugins/lua/milter_headers.lua2
-rw-r--r--src/plugins/lua/ratelimit.lua2
-rw-r--r--src/plugins/lua/reputation.lua2
-rw-r--r--src/plugins/lua/settings.lua2
17 files changed, 13 insertions, 13 deletions
diff --git a/lualib/global_functions.lua b/lualib/global_functions.lua
index 956db8bed..05c967534 100644
--- a/lualib/global_functions.lua
+++ b/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 = {}
diff --git a/lualib/auth_results.lua b/lualib/lua_auth_results.lua
index 92f702950..92f702950 100644
--- a/lualib/auth_results.lua
+++ b/lualib/lua_auth_results.lua
diff --git a/lualib/rspamd_config_transform.lua b/lualib/lua_cfg_transform.lua
index 0823012ba..0823012ba 100644
--- a/lualib/rspamd_config_transform.lua
+++ b/lualib/lua_cfg_transform.lua
diff --git a/lualib/dkim_sign_tools.lua b/lualib/lua_dkim_tools.lua
index a0c93b4ff..a0c93b4ff 100644
--- a/lualib/dkim_sign_tools.lua
+++ b/lualib/lua_dkim_tools.lua
diff --git a/lualib/maps.lua b/lualib/lua_maps.lua
index 7b48db034..7b48db034 100644
--- a/lualib/maps.lua
+++ b/lualib/lua_maps.lua
diff --git a/lualib/meta_functions.lua b/lualib/lua_meta.lua
index 96404192d..96404192d 100644
--- a/lualib/meta_functions.lua
+++ b/lualib/lua_meta.lua
diff --git a/lualib/stat_tools.lua b/lualib/lua_stat.lua
index 4f5cafe3c..4f5cafe3c 100644
--- a/lualib/stat_tools.lua
+++ b/lualib/lua_stat.lua
diff --git a/lualib/rspamadm/configwizard.lua b/lualib/rspamadm/configwizard.lua
index a86bb78ec..fc9005ce0 100644
--- a/lualib/rspamadm/configwizard.lua
+++ b/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"
diff --git a/lualib/rspamadm/stat_convert.lua b/lualib/rspamadm/stat_convert.lua
index f70581fa4..6ad3b0332 100644
--- a/lualib/rspamadm/stat_convert.lua
+++ b/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"
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 889bc7072..97148d22b 100644
--- a/src/libserver/cfg_rcl.c
+++ b/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);
diff --git a/src/plugins/lua/arc.lua b/src/plugins/lua/arc.lua
index c87946aff..29faa1258 100644
--- a/src/plugins/lua/arc.lua
+++ b/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
diff --git a/src/plugins/lua/dkim_signing.lua b/src/plugins/lua/dkim_signing.lua
index 75720df9d..de9a286ff 100644
--- a/src/plugins/lua/dkim_signing.lua
+++ b/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
diff --git a/src/plugins/lua/fann_redis.lua b/src/plugins/lua/fann_redis.lua
index 3120d8b18..828060240 100644
--- a/src/plugins/lua/fann_redis.lua
+++ b/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
diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index a0cca43d3..176597b60 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/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] =
diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index f77e2ae76..d18b79bfe 100644
--- a/src/plugins/lua/ratelimit.lua
+++ b/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'}
diff --git a/src/plugins/lua/reputation.lua b/src/plugins/lua/reputation.lua
index 0d870eee8..9c5f2aaad 100644
--- a/src/plugins/lua/reputation.lua
+++ b/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
diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 1963f9d70..d35c91adf 100644
--- a/src/plugins/lua/settings.lua
+++ b/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 = {}