aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 03:27:50 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 03:27:50 +0000
commit7271c148cef981f9263a8794ebe27634423b07bd (patch)
tree837729c161f9e2d3d65a08790d25bebb37e622e1 /net
parent5b8969b8d9a926294b0f09b3f835ae994d58d012 (diff)
downloadprosody-7271c148cef981f9263a8794ebe27634423b07bd.tar.gz
prosody-7271c148cef981f9263a8794ebe27634423b07bd.zip
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Diffstat (limited to 'net')
-rw-r--r--net/connlisteners.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 2b95331c..cfb6aa39 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,4 +1,5 @@
+local listeners_dir = (CFG_SOURCEDIR or "").."/net/";
local server_add = require "net.server".add;
local log = require "util.logger".init("connlisteners");
@@ -26,7 +27,7 @@ end
function get(name)
local h = listeners[name];
if not h then
- pcall(dofile, "net/"..name:gsub("[^%w%-]", "_").."_listener.lua");
+ pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
h = listeners[name];
end
return h;
@@ -42,4 +43,4 @@ function start(name, udata)
(udata and udata.interface) or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil );
end
-return _M; \ No newline at end of file
+return _M;