prosody: Change plugin_path -> plugin_paths and make it an array instead of a string
authorMatthew Wild <mwild1@gmail.com>
Tue, 22 Feb 2011 18:02:23 +0000 (18:02 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 22 Feb 2011 18:02:23 +0000 (18:02 +0000)
prosody

diff --git a/prosody b/prosody
index 48977c30ce5a7d69620c5a2582d9662c3aedd2a1..81d871538c844b43ceff2176d3fa01925f49cb53 100755 (executable)
--- 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 };