mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.{prosodyctl,openssl}: More use of config sections removed

Browse source
This commit is contained in:
Kim Alvefur 2013-03-23 02:38:30 +01:00
parent 16c7c4e78d
commit 613c9b00c4
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/openssl.lua
View file

@ -100,13 +100,13 @@ function ssl_config:from_prosody(hosts, config, certhosts)
if name == certhost or name:sub(-1-#certhost) == "."..certhost then
found_matching_hosts = true;
self:add_dNSName(name);
--print(name .. "#component_module: " .. (config.get(name, "core", "component_module") or "nil"));
if config.get(name, "core", "component_module") == nil then
--print(name .. "#component_module: " .. (config.get(name, "component_module") or "nil"));
if config.get(name, "component_module") == nil then
self:add_sRVName(name, "xmpp-client");
end
--print(name .. "#anonymous_login: " .. tostring(config.get(name, "core", "anonymous_login")));
if not (config.get(name, "core", "anonymous_login") or
config.get(name, "core", "authentication") == "anonymous") then
--print(name .. "#anonymous_login: " .. tostring(config.get(name, "anonymous_login")));
if not (config.get(name, "anonymous_login") or
config.get(name, "authentication") == "anonymous") then
self:add_sRVName(name, "xmpp-server");
end
self:add_xmppAddr(name);

4
util/prosodyctl.lua
View file

@ -182,12 +182,12 @@ function deluser(params)
end
function getpid()
local pidfile = config.get("*", "core", "pidfile");
local pidfile = config.get("*", "pidfile");
if not pidfile then
return false, "no-pidfile";
end
local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
local modules_enabled = set.new(config.get("*", "modules_enabled"));
if not modules_enabled:contains("posix") then
return false, "no-posix";
end