diff plugins/mod_posix.lua @ 6054:7a5ddbaf758d

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 02 Apr 2014 17:41:38 +0100
parents 3547f315a1f5
children 1056ea08970f
line wrap: on
line diff
--- a/plugins/mod_posix.lua	Wed Apr 02 14:31:19 2014 +0100
+++ b/plugins/mod_posix.lua	Wed Apr 02 17:41:38 2014 +0100
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -128,7 +128,7 @@
 end
 require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
 
-local daemonize = module:get_option("daemonize");
+local daemonize = module:get_option("daemonize", prosody.installed);
 if daemonize == nil then
 	local no_daemonize = module:get_option("no_daemonize"); --COMPAT w/ 0.5
 	daemonize = not no_daemonize;
@@ -183,7 +183,7 @@
 		prosody.reload_config();
 		prosody.reopen_logfiles();
 	end);
-	
+
 	signal.signal("SIGINT", function ()
 		module:log("info", "Received SIGINT");
 		prosody.unlock_globals();