prosody, prosodyctl: Use plugin_paths in addition to, not instead of, the default...

diff --git a/prosody b/prosody
index 81d871538c844b43ceff2176d3fa01925f49cb53..0aba4bb68097370c1c18a4491e613d081acb2703 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -186,10 +186,12 @@ function init_global_state()
        local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
        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
+               local path_sep = package.config:sub(3,3);
+               -- path1;path2;path3;defaultpath...
+               CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
        end
        prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
-                         plugins = CFG_PLUGINDIR, data = data_path };
+                         plugins = CFG_PLUGINDIR or "plugins", data = data_path };
 
        prosody.arg = _G.arg;
 

diff --git a/prosodyctl b/prosodyctl
index 2005a3ed292fab073681884b929cf518ea783067..8fdf3488cea6bb0bc5cdbf048f35469a502d968e 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -112,10 +112,12 @@ config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } });
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
 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
+       local path_sep = package.config:sub(3,3);
+       -- path1;path2;path3;defaultpath...
+       CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 end
 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
-                 plugins = CFG_PLUGINDIR, data = data_path };
+                 plugins = CFG_PLUGINDIR or "plugins", data = data_path };
 
 require "core.loggingmanager"