aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-03-23 02:38:30 +0100
committerKim Alvefur <zash@zash.se>2013-03-23 02:38:30 +0100
commit613c9b00c4e9073f74e53efaa1c31ae00a73eae4 (patch)
tree7d438b5b059d336baeea46bbf9dff2fe05538cc9
parent16c7c4e78d92b0c86466fe2e4851617665463193 (diff)
downloadprosody-613c9b00c4e9073f74e53efaa1c31ae00a73eae4.tar.gz
prosody-613c9b00c4e9073f74e53efaa1c31ae00a73eae4.zip
util.{prosodyctl,openssl}: More use of config sections removed
-rw-r--r--util/openssl.lua10
-rw-r--r--util/prosodyctl.lua4
2 files changed, 7 insertions, 7 deletions
diff --git a/util/openssl.lua b/util/openssl.lua
index b3dc2943..0decb579 100644
--- 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 e38f85d4..1ab1d0bb 100644
--- 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