Revert "Change. Use require "resources.functions.config" to load config file."

This commit is contained in:
FusionPBX
2015-08-10 11:50:29 -06:00
parent 1a29486bcc
commit 2a2dd209df
69 changed files with 507 additions and 294 deletions

View File

@@ -1,26 +1,12 @@
-- add file_exists function
require "resources.functions.file_exists";
--find and return path to the config.lua
function config()
dofile(scripts_dir.."/resources/functions/file_exists.lua");
if (file_exists("/etc/fusionpbx/config.lua")) then
return "/etc/fusionpbx/config.lua";
elseif (file_exists("/usr/local/etc/fusionpbx/config.lua")) then
return "/usr/local/etc/fusionpbx/config.lua";
else
return "resources.config";
return scripts_dir.."/resources/config.lua";
end
end
-- load config
function load_config()
local cfg = config()
if cfg:sub(1,1) == '//' then
dofile(cfg)
else
require(cfg)
end
end
load_config()
end