Software /
code /
prosody
Annotate
tools/migration/migrator.cfg.lua @ 10224:94e341dee51c
core.certmanager: Move EECDH ciphers before EDH in default cipherstring
The original intent of having kEDH before kEECDH was that if a `dhparam`
file was specified, this would be interpreted as a preference by the
admin for old and well-tested Diffie-Hellman key agreement over newer
elliptic curve ones. Otherwise the faster elliptic curve ciphersuites
would be preferred. This didn't really work as intended since this
affects the ClientHello on outgoing s2s connections, leading to some
servers using poorly configured kEDH.
With Debian shipping OpenSSL settings that enforce a higher security
level, this caused interoperability problems with servers that use DH
params smaller than 2048 bits. E.g. jabber.org at the time of this
writing has 1024 bit DH params.
MattJ says
> Curves have won, and OpenSSL is less weird about them now
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sun, 25 Aug 2019 20:22:35 +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 ]] |