Merge remote-tracking branch 'processone/pr/2203'

* processone/pr/2203: mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:33:18 +01:00 · 2018-01-03 22:33:18 +01:00 · dbbe3a9e62
parent 1fcb6d7f36 264add87fa
commit dbbe3a9e62
1 changed files with 2 additions and 1 deletions
--- a/src/mod_proxy65_service.erl
+++ b/src/mod_proxy65_service.erl
@ -252,8 +252,9 @@ transform_module_options(Opts) ->
 -spec get_streamhost(binary(), binary()) -> streamhost().
 get_streamhost(Host, ServerHost) ->
    {Port, IP} = get_port_ip(ServerHost),
-    HostName = gen_mod:get_module_opt(ServerHost, mod_proxy65, hostname,
+    HostName0 = gen_mod:get_module_opt(ServerHost, mod_proxy65, hostname,
 				      misc:ip_to_list(IP)),
+    HostName = misc:expand_keyword(<<"@HOST@">>, HostName0, ServerHost),
    Resource = ejabberd_cluster:node_id(),
    #streamhost{jid = jid:make(<<"">>, Host, Resource),
 		host = HostName,