diff options
author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-11-06 13:43:30 +0300 |
---|---|---|
committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-11-06 13:43:30 +0300 |
commit | c48e9725736165b2f88631922af0239739db0fc0 (patch) | |
tree | d96ae5bb1f5d4e464ac973dce454a855ea1801ec | |
parent | Accept a list in c2s_ciphers/s2s_ciphers options (diff) |
Allow multiple `modules` section
Fixes processone/ejabberd-contrib#282
-rw-r--r-- | src/ejabberd_config.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 8ef391bb9..dac5249ca 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -557,11 +557,13 @@ pre_validate(Y1) -> version => ejabberd_options:opt_type(version), host_config => econf:map(econf:binary(), econf:any()), append_host_config => econf:map(econf:binary(), econf:any()), + modules => ejabberd_options:opt_type(modules), '_' => econf:any()}, [{required, [hosts]}]), Y1) of {ok, Y2} -> - {ok, group_duplicated_options(Y2, [append_host_config, host_config])}; + {ok, group_duplicated_options( + Y2, [append_host_config, host_config, modules])}; Err -> Err end. |