prosody
4ea7bd7325be
tools/migration/migrator.cfg.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

tools/migration/migrator.cfg.lua @ 13792:4ea7bd7325be 13.0

core.portmanager: Restore use of per-host 'ssl' for SNI hosts. Fixes #1915. This was an unintentional regression, as per-host 'ssl' options became valid in 0.12 when SNI support was added for direct TLS ports. While we encourage most people to use the simpler automatic certificate selection (and it seems most do, given the overlooking of this bug), there are likely always going to be use cases for manually-configured certificates. The issue was introduced in commit 7e9ebdc75ce4 which inadvertently removed the per-host option checking for SNI.
author Kim Alvefur <zash@zash.se>
date Sat, 29 Mar 2025 22:25:19 +0100
parent 13296:803a4ef6244d
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",
13295
b788307ca06a migrator: Update default config template with new stores
Kim Alvefur <zash@zash.se>
parents: 12168
diff changeset
6 "account_roles",
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
7 "roster",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
8 "vcard",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
9 "private",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
10 "blocklist",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
11 "privacy",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
12 "archive-archive",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
13 "offline-archive",
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 10003
diff changeset
14 "pubsub_nodes-pubsub",
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 10003
diff changeset
15 "pep-pubsub",
13295
b788307ca06a migrator: Update default config template with new stores
Kim Alvefur <zash@zash.se>
parents: 12168
diff changeset
16 "cron",
b788307ca06a migrator: Update default config template with new stores
Kim Alvefur <zash@zash.se>
parents: 12168
diff changeset
17 "smacks_h",
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
18 }
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
19 local muc = {
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
20 "persistent",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
21 "config",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
22 "state",
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
23 "muc_log-archive",
13295
b788307ca06a migrator: Update default config template with new stores
Kim Alvefur <zash@zash.se>
parents: 12168
diff changeset
24 "cron",
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
25 };
13296
803a4ef6244d migrator: Add mod_http_file_share example to config template
Kim Alvefur <zash@zash.se>
parents: 13295
diff changeset
26 local upload = {
803a4ef6244d migrator: Add mod_http_file_share example to config template
Kim Alvefur <zash@zash.se>
parents: 13295
diff changeset
27 "uploads-archive",
803a4ef6244d migrator: Add mod_http_file_share example to config template
Kim Alvefur <zash@zash.se>
parents: 13295
diff changeset
28 "upload_stats",
803a4ef6244d migrator: Add mod_http_file_share example to config template
Kim Alvefur <zash@zash.se>
parents: 13295
diff changeset
29 "cron",
803a4ef6244d migrator: Add mod_http_file_share example to config template
Kim Alvefur <zash@zash.se>
parents: 13295
diff changeset
30 }
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
31
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
32 input {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
33 hosts = {
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
34 ["example.com"] = vhost;
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
35 ["conference.example.com"] = muc;
13296
803a4ef6244d migrator: Add mod_http_file_share example to config template
Kim Alvefur <zash@zash.se>
parents: 13295
diff changeset
36 ["share.example.com"] = upload;
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
37 };
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
38 type = "internal";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
39 path = data_path;
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
40 }
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
41
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
42 output {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
43 type = "sql";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
44 driver = "SQLite3";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
45 database = data_path.."/prosody.sqlite";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
46 }
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
47
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
48 --[[
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
49
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
50 input {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
51 type = "internal";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
52 path = data_path;
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
53 }
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
54 output {
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 4211
diff changeset
55 type = "sql";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
56 driver = "SQLite3";
4209
df753c398aa0 tools/migration/config.lua: Minor fixes for more sensible defaults
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
57 database = data_path.."/prosody.sqlite";
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
58 }
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
59
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
60 ]]