diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-10 00:24:29 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-10 00:24:29 +0200 |
| commit | 1780d1f59008f46b7423eb67c6063640230f9ba1 (patch) | |
| tree | e7923c70fb6349ab8e9578b2fe7e092692b572ba | |
| parent | b4848c3af769afe68a2e24463738a88af6649d49 (diff) | |
| download | prosody-1780d1f59008f46b7423eb67c6063640230f9ba1.tar.gz prosody-1780d1f59008f46b7423eb67c6063640230f9ba1.zip | |
prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms
| -rwxr-xr-x | prosodyctl | 6 | ||||
| -rw-r--r-- | util/prosodyctl.lua | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -414,7 +414,11 @@ function commands.start(arg) local ok, ret = prosodyctl.start(); if ok then - if config.get("*", "daemonize") ~= false then + local daemonize = config.get("*", "daemonize"); + if daemonize == nil then + daemonize = prosody.installed; + end + if daemonize then local i=1; while true do local ok, running = prosodyctl.isrunning(); diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index fe862114..d59c163c 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -189,8 +189,8 @@ function getpid() return false, "no-pidfile"; end - local modules_enabled = set.new(config.get("*", "modules_enabled")); - if not modules_enabled:contains("posix") then + local modules_enabled = set.new(config.get("*", "modules_disabled")); + if prosody.platform ~= "posix" or modules_enabled:contains("posix") then return false, "no-posix"; end |