From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Fri, 23 Mar 2018 13:08:12 +0000 (+0300)
Subject: Move force_node_config defaults into ejabberd.yml.example
X-Git-Tag: 18.03~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55604b2d970a998cc9f1909fcbd08176e1ed6096;p=ejabberd

Move force_node_config defaults into ejabberd.yml.example
---

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, []}].