[Rework] Antivirus: Move antivirus routines to lua_scanners

diff --git a/lualib/lua_antivirus.lua b/lualib/lua_scanners/antivirus.lua
similarity index 100%
rename from lualib/lua_antivirus.lua
rename to lualib/lua_scanners/antivirus.lua

diff --git a/lualib/lua_scanners/init.lua b/lualib/lua_scanners/init.lua
new file mode 100644 (file)
index 0000000..5c76ada
--- /dev/null
+++ b/lualib/lua_scanners/init.lua
@@ -0,0 +1,26 @@
+--[[
+Copyright (c) 2018, Vsevolod Stakhov <vsevolod@highsecure.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]--
+
+--[[[
+-- @module lua_scanners
+-- This module contains external scanners functions
+--]]
+
+local exports = {
+  antivirus = require "antivirus",
+}
+
+return exports
\ No newline at end of file

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index ed3d93e798658eb6b47d536797700bf7cdbdf095..b32771ddd13949754f189db322d380bbb71900d5 100644 (file)
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -18,7 +18,7 @@ local rspamd_logger = require "rspamd_logger"
 local rspamd_regexp = require "rspamd_regexp"
 local lua_util = require "lua_util"
 local fun = require "fun"
-local lua_antivirus = require "lua_antivirus"
+local lua_antivirus = require("lua_scanners").antivirus
 local redis_params
 
 local N = "antivirus"