aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2017-12-20 11:53:18 +0100
committerChristophe Romain <christophe.romain@process-one.net>2017-12-20 11:53:18 +0100
commit242c3c1da5fd9656bf9fa3703c107a818c7d2bea (patch)
treeedf01942a8f7dfde273cd408c97aed20f637cb76 /src
parentMerge pull request #2164 from angelo-chan/master (diff)
Fix mix_sql features and options
Diffstat (limited to 'src')
-rw-r--r--src/node_mix_sql.erl35
1 files changed, 2 insertions, 33 deletions
diff --git a/src/node_mix_sql.erl b/src/node_mix_sql.erl
index 5ba2cd21d..1de3ab739 100644
--- a/src/node_mix_sql.erl
+++ b/src/node_mix_sql.erl
@@ -53,41 +53,10 @@ terminate(Host, ServerHost) ->
node_flat_sql:terminate(Host, ServerHost).
options() ->
- [{deliver_payloads, true},
- {notify_config, false},
- {notify_delete, false},
- {notify_retract, true},
- {purge_offline, false},
- {persist_items, true},
- {max_items, ?MAXITEMS},
- {subscribe, true},
- {access_model, open},
- {roster_groups_allowed, []},
- {publish_model, open},
- {notification_type, headline},
- {max_payload_size, ?MAX_PAYLOAD_SIZE},
- {send_last_published_item, never},
- {deliver_notifications, true},
- {broadcast_all_resources, true},
- {presence_based_delivery, false},
- {itemreply, none}].
+ [{sql, true}, {rsm, true} | node_mix:options()].
features() ->
- [<<"create-nodes">>,
- <<"delete-nodes">>,
- <<"delete-items">>,
- <<"instant-nodes">>,
- <<"item-ids">>,
- <<"outcast-affiliation">>,
- <<"persistent-items">>,
- <<"publish">>,
- <<"purge-nodes">>,
- <<"retract-items">>,
- <<"retrieve-affiliations">>,
- <<"retrieve-items">>,
- <<"retrieve-subscriptions">>,
- <<"subscribe">>,
- <<"subscription-notifications">>].
+ [<<"rsm">> | node_mix:features()].
create_node_permission(Host, ServerHost, Node, ParentNode, Owner, Access) ->
node_flat_sql:create_node_permission(Host, ServerHost, Node, ParentNode, Owner, Access).