X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=86e82490a8f460aba9b83e5435c56bc58cb86e10;hb=42a35c1d10f192328b445b98cd3227da2c55dd9d;hp=8dcb0096de6f8457043b10213f13eb8ca57165e3;hpb=7a6ab6461ea53d99fb6fb011949e6a66ffa7a609;p=prosody.git

diff --git a/prosody b/prosody
index 8dcb0096..86e82490 100755
--- a/prosody
+++ b/prosody
@@ -184,8 +184,14 @@ function init_global_state()
 	prosody.hosts = hosts;
 	
 	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 };
 
 	prosody.arg = _G.arg;
 
@@ -339,6 +345,7 @@ function load_secondary_libraries()
 	]]
 
 	require "net.connlisteners";
+	require "net.httpserver";
 	
 	require "util.stanza"
 	require "util.jid"