projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_compression: Only iterate over correctly named and namespaced child tags of compr...
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 9a88eac0b227e65406608276a3f4e861fe78ef94..b411370fb1f0b63e4d8ed0f9d7c24061525c8545 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-86,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");
@@
-240,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));
@@
-264,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()