projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with daurnimator
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index da77719daf317b8a99ca08f1a89af71b40299a5e..b411370fb1f0b63e4d8ed0f9d7c24061525c8545 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-70,6
+70,8
@@
function read_config()
if CFG_CONFIGDIR then
table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
end
if CFG_CONFIGDIR then
table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
end
+ elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl
+ table.insert(filenames, os.getenv("PROSODY_CONFIG"));
else
for _, format in ipairs(config.parsers()) do
table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
else
for _, format in ipairs(config.parsers()) do
table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
@@
-84,6
+86,7
@@
function read_config()
break;
end
end
break;
end
end
+ prosody.config_file = filename
local ok, level, err = config.load(filename);
if not ok then
print("\n");
local ok, level, err = config.load(filename);
if not ok then
print("\n");
@@
-130,8
+133,8
@@
end
function sanity_check()
for host, host_config in pairs(config.getconfig()) do
if host ~= "*"
function sanity_check()
for host, host_config in pairs(config.getconfig()) do
if host ~= "*"
- and host_config.
core.
enabled ~= false
- and not host_config.co
re.co
mponent_module then
+ and host_config.enabled ~= false
+ and not host_config.component_module then
return;
end
end
return;
end
end
@@
-196,6
+199,7
@@
function set_function_metatable()
end
function init_global_state()
end
function init_global_state()
+ -- COMPAT: These globals are deprecated
bare_sessions = {};
full_sessions = {};
hosts = {};
bare_sessions = {};
full_sessions = {};
hosts = {};
@@
-204,8
+208,8
@@
function init_global_state()
prosody.full_sessions = full_sessions;
prosody.hosts = hosts;
prosody.full_sessions = full_sessions;
prosody.hosts = hosts;
- local data_path = config.get("*", "
core", "
data_path") or CFG_DATADIR or "data";
- local custom_plugin_paths = config.get("*", "
core", "
plugin_paths");
+ local data_path = config.get("*", "data_path") or CFG_DATADIR or "data";
+ local custom_plugin_paths = config.get("*", "plugin_paths");
if custom_plugin_paths then
local path_sep = package.config:sub(3,3);
-- path1;path2;path3;defaultpath...
if custom_plugin_paths then
local path_sep = package.config:sub(3,3);
-- path1;path2;path3;defaultpath...
@@
-237,7
+241,7
@@
function init_global_state()
function prosody.reload_config()
log("info", "Reloading configuration file");
prosody.events.fire_event("reloading-config");
function prosody.reload_config()
log("info", "Reloading configuration file");
prosody.events.fire_event("reloading-config");
- local ok, level, err = config.load(
(rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua"
);
+ local ok, level, err = config.load(
prosody.config_file
);
if not ok then
if level == "parser" then
log("error", "There was an error parsing the configuration file: %s", tostring(err));
if not ok then
if level == "parser" then
log("error", "There was an error parsing the configuration file: %s", tostring(err));
@@
-261,12
+265,6
@@
function init_global_state()
prosody.events.fire_event("server-stopping", {reason = reason});
server.setquitting(true);
end
prosody.events.fire_event("server-stopping", {reason = reason});
server.setquitting(true);
end
-
- -- Load SSL settings from config, and create a ctx table
- local certmanager = require "core.certmanager";
- local global_ssl_ctx = certmanager.create_context("*", "server");
- prosody.global_ssl_ctx = global_ssl_ctx;
-
end
function read_version()
end
function read_version()
@@
-287,12
+285,12
@@
function load_secondary_libraries()
--- Load and initialise core modules
require "util.import"
require "util.xmppstream"
--- Load and initialise core modules
require "util.import"
require "util.xmppstream"
- require "core.rostermanager"
require "core.stanza_router"
require "core.hostmanager"
require "core.portmanager"
require "core.modulemanager"
require "core.usermanager"
require "core.stanza_router"
require "core.hostmanager"
require "core.portmanager"
require "core.modulemanager"
require "core.usermanager"
+ require "core.rostermanager"
require "core.sessionmanager"
package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));
require "core.sessionmanager"
package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));