projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.sql: Allow creating unique indices
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 5802c348ee68995331e36b9969802ad73ef5a369..1a0f6ff2d76119f7907785187a94e0541be72079 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-207,8
+207,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...
@@
-264,12
+264,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()
@@
-290,12
+284,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]*)"));