prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default...

diff --git a/prosodyctl b/prosodyctl
index c3adad4dcffb8b9a1b4fbb0a4e28a13391afdb49..00aeac400752d80dce5821fe33abba154fd8ba66 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -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 fe862114535bcc44c21906b3514249bbc90cf861..d59c163ce2f975c20b77325351a8e5be5312ca5d 100644 (file)
--- 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