diff options
author | Alexey Shchepin <alexey@process-one.net> | 2007-08-25 17:24:00 +0000 |
---|---|---|
committer | Alexey Shchepin <alexey@process-one.net> | 2007-08-25 17:24:00 +0000 |
commit | 5dfa6edda35848f13252afa32eae1f1818b072e6 (patch) | |
tree | 0162c87a8ba7382af4e16a2965f55e798f69b709 /src/mod_proxy65 | |
parent | Fixed conflict (diff) |
* src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host'
option (thanks to Badlop)
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
SVN Revision: 888
Diffstat (limited to 'src/mod_proxy65')
-rw-r--r-- | src/mod_proxy65/mod_proxy65_service.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mod_proxy65/mod_proxy65_service.erl b/src/mod_proxy65/mod_proxy65_service.erl index f9f3bf12d..de6a6c45c 100644 --- a/src/mod_proxy65/mod_proxy65_service.erl +++ b/src/mod_proxy65/mod_proxy65_service.erl @@ -3,7 +3,6 @@ %%% Author : Evgeniy Khramtsov <xram@jabber.ru> %%% Purpose : SOCKS5 Bytestreams XMPP service. %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> -%%% Id : $Id$ %%%---------------------------------------------------------------------- -module(mod_proxy65_service). @@ -175,7 +174,7 @@ iq_vcard(Lang) -> "Copyright (c) 2003-2006 Alexey Shchepin")}]}]. parse_options(ServerHost, Opts) -> - MyHost = gen_mod:get_opt(host, Opts, "proxy." ++ ServerHost), + MyHost = gen_mod:get_opt_host(ServerHost, Opts, "proxy.@HOST@"), Port = gen_mod:get_opt(port, Opts, 7777), ACL = gen_mod:get_opt(access, Opts, all), Name = gen_mod:get_opt(name, Opts, "SOCKS5 Bytestreams"), @@ -201,4 +200,4 @@ get_proxy_or_domainip(ServerHost, MyHost) -> {ok, Addr} -> Addr; {error, _} -> {127,0,0,1} end - end.
\ No newline at end of file + end. |