Merge with 0.4

Tue, 05 May 2009 16:17:40 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 05 May 2009 16:17:40 +0100
changeset 1121
063036ac82b7
parent 1119
61a011ebe243 (current diff)
parent 1120
23fa69b911f7 (diff)
child 1125
ad7c1cefb8eb

Merge with 0.4

--- a/prosodyctl	Tue May 05 14:20:26 2009 +0100
+++ b/prosodyctl	Tue May 05 16:17:40 2009 +0100
@@ -61,6 +61,9 @@
 	end
 end
 
+local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+require "util.datamanager".set_data_path(data_path);
+
 -- Switch away from root and into the prosody user --
 local switched_user, current_uid;
 local ok, pposix = pcall(require, "util.pposix");

mercurial