usermanager: Check host exists before trying to look up admins for it

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 02f2e1367a3050cfa883b5c795422674ec7d3b42..8fdf3488cea6bb0bc5cdbf048f35469a502d968e 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -110,8 +110,14 @@ local original_logging_config = config.get("*", "core", "log");
 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
+       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"