Annotate

tools/migration/migrator.cfg.lua @ 10684:de607875d4bd

MUC: Pass previous role to :publicise_occupant_status() whenever possible Currently there is what amounts to a hack in presence_broadcast.lib.lua to make it always broadcast presence with roles of "none". This is to ensure that if you previously saw available presence for someone, you will also see the unavailable presence (which always has role="none"). The correct approach is to take into account what the previous role was ( i.e. answer the question: "Was the available presence for this occupant a role for which presence broadcast is enabled?). The logic is already in place to do this correctly, but most call sites do not provide the previous role (prev_role argument) of the occupant, which causes it to not be used. In its place the hack to always broadcast presence of role="none" has allowed things to continue to work. The intention is that a subsequent commit will remove the unconditional broadcast of role="none".
author Matthew Wild <mwild1@gmail.com>
date Thu, 12 Mar 2020 14:10:12 +0000
parent 10003:4d702f0c6273
child 12168:33e856c65033
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
1 local data_path = "../../data";
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
2
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
3 local vhost = {
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
4 "accounts",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
5 "account_details",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
6 "roster",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
7 "vcard",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
8 "private",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
9 "blocklist",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
10 "privacy",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
11 "archive-archive",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
12 "offline-archive",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
13 "pubsub_nodes",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
14 -- "pubsub_*-archive",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
15 "pep",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
16 -- "pep_*-archive",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
17 }
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
18 local muc = {
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
19 "persistent",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
20 "config",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
21 "state",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
22 "muc_log-archive",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
23 };
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
24
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
25 input {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
26 hosts = {
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
27 ["example.com"] = vhost;
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
28 ["conference.example.com"] = muc;
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
29 };
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
30 type = "internal";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
31 path = data_path;
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
32 }
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
33
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
34 output {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
35 type = "sql";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
36 driver = "SQLite3";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
37 database = data_path.."/prosody.sqlite";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
38 }
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
39
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
40 --[[
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
41
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
42 input {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
43 type = "internal";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
44 path = data_path;
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
45 }
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
46 output {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
47 type = "sql";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
48 driver = "SQLite3";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
49 database = data_path.."/prosody.sqlite";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
50 }
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
51
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
52 ]]