projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7a6ab64
)
prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths...
author
Matthew Wild
<mwild1@gmail.com>
Fri, 7 Jan 2011 11:56:52 +0000
(11:56 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 7 Jan 2011 11:56:52 +0000
(11:56 +0000)
prosodyctl
patch
|
blob
|
history
diff --git
a/prosodyctl
b/prosodyctl
index 18f430c5b22e1ad8b34c1d086ea89a6d61419888..2c31c641384a340d0e95916c81d4851a51829418 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-109,13
+109,14
@@
end
local original_logging_config = config.get("*", "core", "log");
config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } });
local original_logging_config = config.get("*", "core", "log");
config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } });
+local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
+ plugins = CFG_PLUGINDIR, data = data_path };
+
require "core.loggingmanager"
dependencies.log_warnings();
require "core.loggingmanager"
dependencies.log_warnings();
-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;
-- Switch away from root and into the prosody user --
local switched_user, current_uid;