diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-07-06 01:07:36 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-07-06 01:07:36 +0300 |
| commit | 0bb14d16c7505493b2e8ae69f1d155f6cf71f5e9 (patch) | |
| tree | dfe971b37d6f93b1aa69c5957cb56258e82632b3 /src/ejabberd_config.erl | |
| parent | Use p1_rand in the test suite (diff) | |
Move XMPP stream and SASL processing to xmpp repo
Diffstat (limited to 'src/ejabberd_config.erl')
| -rw-r--r-- | src/ejabberd_config.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 8e55ae4d..5dcb2471 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -782,8 +782,13 @@ set_opts(State) -> fun(#local_config{key = Key, value = Val}) -> {Key, Val} end, Opts)), + set_fqdn(), set_log_level(). +set_fqdn() -> + FQDNs = get_option(fqdn, []), + xmpp:set_config([{fqdn, FQDNs}]). + set_log_level() -> Level = get_option(loglevel, 4), ejabberd_logger:set(Level). @@ -1452,10 +1457,16 @@ opt_type(node_start) -> fun(I) when is_integer(I), I>=0 -> I end; opt_type(validate_stream) -> fun(B) when is_boolean(B) -> B end; +opt_type(fqdn) -> + fun(Domain) when is_binary(Domain) -> + [Domain]; + (Domains) -> + [iolist_to_binary(Domain) || Domain <- Domains] + end; opt_type(_) -> [hide_sensitive_log_data, hosts, language, max_fsm_queue, default_db, default_ram_db, queue_type, queue_dir, loglevel, - use_cache, cache_size, cache_missed, cache_life_time, + use_cache, cache_size, cache_missed, cache_life_time, fqdn, shared_key, node_start, validate_stream, negotiation_timeout]. -spec may_hide_data(any()) -> any(). |