Move force_node_config defaults into ejabberd.yml.example

diff --git a/ejabberd.yml.example b/ejabberd.yml.example
index 00f272733cbaf4f81f839df6fca63f835d8df8ef..70da58f7b2f07bb76318931bf86f5075b046521b 100644 (file)
--- 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 fc942ff794d3f63c134ce82628759fdd7046253c..8ca3c1ac287e7fdb17004337eb176afdb956889a 100644 (file)
--- 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, []}].