diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-02-22 18:02:23 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-02-22 18:02:23 +0000 |
commit | 65c179b10dd6fb410a4aa4747993e4ff68eca3f8 (patch) | |
tree | eeab6b85ca82dd755f821029fb76a13f6e5a6589 /prosody | |
parent | d663facee9479c36b3f883253db7b19c3ae4f92e (diff) | |
download | prosody-65c179b10dd6fb410a4aa4747993e4ff68eca3f8.tar.gz prosody-65c179b10dd6fb410a4aa4747993e4ff68eca3f8.zip |
prosody: Change plugin_path -> plugin_paths and make it an array instead of a string
Diffstat (limited to 'prosody')
-rwxr-xr-x | prosody | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 }; |