aboutsummaryrefslogtreecommitdiffstats
path: root/util/prosodyctl.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
committerKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
commit2bde8103f5dba708e6e7a9b0773eba493bfefa7c (patch)
treefc52870bbca26966e739b1654dd7ff728fbbd9e0 /util/prosodyctl.lua
parentbcd8f33f5be7555e0c7863b76e950bd9d156afe0 (diff)
parentaa0eb8fdc87589433a1cd5d03f136fb6f32a7426 (diff)
downloadprosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.tar.gz
prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.zip
Merge 0.9->trunk
Diffstat (limited to 'util/prosodyctl.lua')
-rw-r--r--util/prosodyctl.lua4
1 files changed, 2 insertions, 2 deletions
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