# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1241536660 -3600
# Node ID 063036ac82b7c3a9dbd3c504562665a4cdda5a54
# Parent  61a011ebe243cdecf587d0cdf00d88caf9d6444a# Parent  23fa69b911f722825ddf23f8c3f33e6f2cae982b
Merge with 0.4

diff -r 61a011ebe243 -r 063036ac82b7 prosodyctl
--- 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");