Merge 0.10->trunk

[prosody.git] / plugins / mod_posix.lua

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 7a6ccd9478ba13fbb0b4c292914b4c044f5ef64c..c9b9f3aa03986506831fa35c29aae9bf5ddd43d7 100644 (file)
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -80,7 +80,7 @@ local function write_pidfile()
        if pidfile_handle then
                remove_pidfile();
        end
-       pidfile = module:get_option("pidfile");
+       pidfile = module:get_option_string("pidfile");
        if pidfile then
                local err;
                local mode = stat(pidfile) and "r+" or "w+";
@@ -128,15 +128,7 @@ function syslog_sink_maker(config)
 end
 require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
 
-local daemonize = module:get_option("daemonize");
-if daemonize == nil then
-       local no_daemonize = module:get_option("no_daemonize"); --COMPAT w/ 0.5
-       daemonize = not no_daemonize;
-       if no_daemonize ~= nil then
-               module:log("warn", "The 'no_daemonize' option is now replaced by 'daemonize'");
-               module:log("warn", "Update your config from 'no_daemonize = %s' to 'daemonize = %s'", tostring(no_daemonize), tostring(daemonize));
-       end
-end
+local daemonize = module:get_option("daemonize", prosody.installed);
 
 local function remove_log_sinks()
        local lm = require "core.loggingmanager";