From 1363993367e468526666d1255df469b4150506bd Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 24 Feb 2011 01:35:33 +0000 Subject: prosody, prosodyctl: Use plugin_paths in addition to, not instead of, the default plugin path --- prosody | 6 ++++-- prosodyctl | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/prosody b/prosody index 81d87153..0aba4bb6 100755 --- 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 2005a3ed..8fdf3488 100755 --- 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" -- cgit v1.2.3