aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-05-27 01:17:59 +0200
committerKim Alvefur <zash@zash.se>2012-05-27 01:17:59 +0200
commit0667924a0be84d887693e48a0eacec019889c349 (patch)
tree342f7f1eded8ed0bdff4e98a65f021985bcdf230
parent9a9d82e049977c6faed39b711ee73a4b22e7f1da (diff)
downloadprosody-0667924a0be84d887693e48a0eacec019889c349.tar.gz
prosody-0667924a0be84d887693e48a0eacec019889c349.zip
mod_proxy65: Warn about pre-0.9 config style (per host proxy65_port)
-rw-r--r--plugins/mod_proxy65.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index b2f6f703..896780fb 100644
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -91,9 +91,15 @@ function module.add_host(module)
local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service");
local proxy_address = module:get_option("proxy65_address", host);
- local proxy_port = module:get_option_number("proxy65_port", next(portmanager.get_active_services():search("proxy65", nil)[1] or {}));
+ local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {});
local proxy_acl = module:get_option("proxy65_acl");
+ -- COMPAT w/pre-0.9 where proxy65_port was specified the components section of the config
+ local legacy_config = module:get_option_number("proxy65_port");
+ if legacy_config then
+ module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config);
+ end
+
module:add_identity("proxy", "bytestreams", name);
module:add_feature("http://jabber.org/protocol/bytestreams");