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

diff --git a/util/openssl.lua b/util/openssl.lua
index b3dc2943853b3eab1838c2189e8e408331eb21e2..0decb5797a481d8782c1dad37fb95d204110af1e 100644 (file)
--- a/util/openssl.lua
+++ b/util/openssl.lua
@@ -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);

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index e38f85d47a26ea5a6d0e24e5dbea7ebb0cfde0a9..1ab1d0bb9d90c4c3dd84328a9c62095008cbc9db 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -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