X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=86e82490a8f460aba9b83e5435c56bc58cb86e10;hb=bd7160af2e551d2b49a5c8eb241afd7c120a8ecd;hp=42c3acad954e9af727c7887ac6bbcd861b733d3f;hpb=f793d5882e8e75e03836d0efc7d4fce2377aa0e3;p=prosody.git

diff --git a/prosody b/prosody
index 42c3acad..86e82490 100755
--- a/prosody
+++ b/prosody
@@ -183,9 +183,16 @@ function init_global_state()
 	prosody.full_sessions = full_sessions;
 	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 = CFG_DATADIR };
-	
+	                  plugins = CFG_PLUGINDIR or "plugins", data = data_path };
+
 	prosody.arg = _G.arg;
 
 	prosody.platform = "unknown";
@@ -338,14 +345,13 @@ function load_secondary_libraries()
 	]]
 
 	require "net.connlisteners";
+	require "net.httpserver";
 	
 	require "util.stanza"
 	require "util.jid"
 end
 
 function init_data_store()
-	local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
-	require "util.datamanager".set_data_path(data_path);
 	require "core.storagemanager";
 end