diff options
author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-23 16:08:12 +0300 |
---|---|---|
committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-23 16:08:12 +0300 |
commit | 55604b2d970a998cc9f1909fcbd08176e1ed6096 (patch) | |
tree | 059771bdfed48fb4622cc1dbbc11c108663c78b1 | |
parent | 92bc5dc85b14b83ad22de6527b649124df4fce9a (diff) |
Move force_node_config defaults into ejabberd.yml.example
-rw-r--r-- | ejabberd.yml.example | 5 | ||||
-rw-r--r-- | src/mod_pubsub.erl | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ejabberd.yml.example b/ejabberd.yml.example index 00f272733..70da58f7b 100644 --- a/ejabberd.yml.example +++ b/ejabberd.yml.example @@ -781,6 +781,11 @@ modules: - "flat" - "hometree" - "pep" # pep requires mod_caps + ## Avoid using OMEMO by default because it + ## introduces a lot of hard-to-track problems + force_node_config: + "eu.siacs.conversations.axolotl.*": + access_model: whitelist mod_push: {} mod_push_keepalive: {} ## mod_register: diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index fc942ff79..8ca3c1ac2 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -3891,9 +3891,4 @@ mod_options(Host) -> {pep_mapping, []}, {plugins, [?STDNODE]}, {max_subscriptions_node, undefined}, - {default_node_config, []}, - %% Avoid using OMEMO by default because it - %% introduces a lot of hard-to-track problems - {force_node_config, - [{<<"eu.siacs.conversations.axolotl.*">>, - [{access_model, whitelist}]}]}]. + {default_node_config, []}]. |