Software / code / prosody
Changeset
6062:6cc6b4d407df
prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 00:24:29 +0200 |
| parents | 6061:1056ea08970f |
| children | 6063:e626ee2fe106 |
| files | prosodyctl util/prosodyctl.lua |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Thu Apr 10 00:23:35 2014 +0200 +++ b/prosodyctl Thu Apr 10 00:24:29 2014 +0200 @@ -414,7 +414,11 @@ 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();
--- a/util/prosodyctl.lua Thu Apr 10 00:23:35 2014 +0200 +++ b/util/prosodyctl.lua Thu Apr 10 00:24:29 2014 +0200 @@ -189,8 +189,8 @@ 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
