# HG changeset patch # User Kim Alvefur # Date 1364002710 -3600 # Node ID 27de7cc941111bd6e2d3068adc435affd3928111 # Parent ec3accda44d30141f2d34bccdee6c1893ebcc7a7 util.{prosodyctl,openssl}: More use of config sections removed diff -r ec3accda44d3 -r 27de7cc94111 util/openssl.lua --- a/util/openssl.lua Sat Mar 23 02:35:50 2013 +0100 +++ b/util/openssl.lua Sat Mar 23 02:38:30 2013 +0100 @@ -100,13 +100,13 @@ 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); diff -r ec3accda44d3 -r 27de7cc94111 util/prosodyctl.lua --- a/util/prosodyctl.lua Sat Mar 23 02:35:50 2013 +0100 +++ b/util/prosodyctl.lua Sat Mar 23 02:38:30 2013 +0100 @@ -182,12 +182,12 @@ 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