X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosodyctl;h=02f2e1367a3050cfa883b5c795422674ec7d3b42;hb=ad4c1a96926fbe713bfb8e35f9f0a1f7ea03e71e;hp=8fdf3488cea6bb0bc5cdbf048f35469a502d968e;hpb=b241767c8f669ba24bafc5694e4da670e58d0426;p=prosody.git diff --git a/prosodyctl b/prosodyctl index 8fdf3488..02f2e136 100755 --- a/prosodyctl +++ b/prosodyctl @@ -110,14 +110,8 @@ 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 or "plugins", data = data_path }; + plugins = CFG_PLUGINDIR, data = data_path }; require "core.loggingmanager"