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_pubsub/mod_pubsub.erl | |
| 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_pubsub/mod_pubsub.erl')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 34c947580..dfbe44f09 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -3,12 +3,10 @@ %%% Author : Alexey Shchepin <alexey@sevcom.net> %%% Purpose : Pub/sub support (JEP-0060) %%% Created : 4 Jul 2003 by Alexey Shchepin <alexey@sevcom.net> -%%% Id : $Id$ %%%---------------------------------------------------------------------- -module(mod_pubsub). -author('alexey@sevcom.net'). --vsn('$Revision$ '). -behaviour(gen_server). -behaviour(gen_mod). @@ -122,7 +120,7 @@ init([ServerHost, Opts]) -> mnesia:create_table(pubsub_presence, [{ram_copies, [node()]}, {attributes, record_info(fields, pubsub_presence)}]), - Host = gen_mod:get_opt(host, Opts, "pubsub." ++ ServerHost), + Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"), update_table(Host), mnesia:add_table_index(pubsub_node, host_parent), ServedHosts = gen_mod:get_opt(served_hosts, Opts, []), |