Software /
code /
prosody
Annotate
tools/migration/migrator.cfg.lua @ 11590:5aafb832c91b
core.portmanager: Fix race condition in initialization of SNI cert map
Under some circumstances when hosts and modules are loaded in some
certain order, entries end up missing from the SNI map. This manifests
in e.g. `curl https://localhost:5281/` giving an error about
"unrecognized name".
The `service` argument is `nil` when invoked from the "host-activated"
event, leading it to iterating over every service. And then it would not
be fetching e.g. `http_host` from the config, which explains why https
would sometimes not work due to the missing name entry.
Because when `service` is included, this limits the iteration to
matching entries, while also returning the same value as the `name` loop
variable. Because `name == service when service != nil` we can use name
instead in the body of the loop.
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 28 May 2021 17:09:22 +0200 |
parent | 10003:4d702f0c6273 |
child | 12168:33e856c65033 |
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 ]] |