equal
deleted
inserted
replaced
182 prosody.bare_sessions = bare_sessions; |
182 prosody.bare_sessions = bare_sessions; |
183 prosody.full_sessions = full_sessions; |
183 prosody.full_sessions = full_sessions; |
184 prosody.hosts = hosts; |
184 prosody.hosts = hosts; |
185 |
185 |
186 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; |
186 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; |
187 CFG_PLUGINDIR = config.get("*", "core", "plugin_path") or CFG_PLUGINDIR or "plugins" |
187 local custom_plugin_paths = config.get("*", "core", "plugin_paths"); |
|
188 if custom_plugin_paths then |
|
189 CFG_PLUGINDIR = table.concat(custom_plugin_paths, package.config:sub(3,3)); -- path1;path2;path3 |
|
190 end |
188 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, |
191 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, |
189 plugins = CFG_PLUGINDIR, data = data_path }; |
192 plugins = CFG_PLUGINDIR, data = data_path }; |
190 |
193 |
191 prosody.arg = _G.arg; |
194 prosody.arg = _G.arg; |
192 |
195 |