aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-02-22 18:02:23 +0000
committerMatthew Wild <mwild1@gmail.com>2011-02-22 18:02:23 +0000
commit4d6276c7b4217f75a7ffaa4812dfabdf35f2e955 (patch)
tree19496393e819246bc8f3ad7e8b566ddc9454d0df
parent886aab55ec8f151c17e5ff24939b479a0f4dde5a (diff)
downloadprosody-4d6276c7b4217f75a7ffaa4812dfabdf35f2e955.tar.gz
prosody-4d6276c7b4217f75a7ffaa4812dfabdf35f2e955.zip
prosody: Change plugin_path -> plugin_paths and make it an array instead of a string
-rwxr-xr-xprosody5
1 files changed, 4 insertions, 1 deletions
diff --git a/prosody b/prosody
index 48977c30..81d87153 100755
--- a/prosody
+++ b/prosody
@@ -184,7 +184,10 @@ function init_global_state()
prosody.hosts = hosts;
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
- CFG_PLUGINDIR = config.get("*", "core", "plugin_path") or CFG_PLUGINDIR or "plugins"
+ local custom_plugin_paths = config.get("*", "core", "plugin_paths");
+ if custom_plugin_paths then
+ CFG_PLUGINDIR = table.concat(custom_plugin_paths, package.config:sub(3,3)); -- path1;path2;path3
+ end
prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
plugins = CFG_PLUGINDIR, data = data_path };