aboutsummaryrefslogtreecommitdiffstats
path: root/util/prosodyctl/check.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-08-30 11:09:12 +0200
committerKim Alvefur <zash@zash.se>2023-08-30 11:09:12 +0200
commitc6b9037235df00fe32bcef7c5377f739c02f61f2 (patch)
tree6f9a23307d79691b3d22afb5677d0fd4fb0ad579 /util/prosodyctl/check.lua
parent5851729492e3e4092b36b686c712aff5e3a7bca4 (diff)
parentda3d755a15e4f5659e8ce50feb7fc4daceed2df4 (diff)
downloadprosody-c6b9037235df00fe32bcef7c5377f739c02f61f2.tar.gz
prosody-c6b9037235df00fe32bcef7c5377f739c02f61f2.zip
Merge 0.12->trunk
Diffstat (limited to 'util/prosodyctl/check.lua')
-rw-r--r--util/prosodyctl/check.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua
index d3bfc00a..e8e8250d 100644
--- a/util/prosodyctl/check.lua
+++ b/util/prosodyctl/check.lua
@@ -369,7 +369,7 @@ local function check(arg)
local deprecated_replacements = {
anonymous_login = instead_use("option", "authentication", "anonymous");
daemonize = "instead, use the --daemonize/-D or --foreground/-F command line flags";
- disallow_s2s = instead_use("module", "s2s");
+ disallow_s2s = instead_use("module", "s2s", "modules_disabled");
no_daemonize = "instead, use the --daemonize/-D or --foreground/-F command line flags";
require_encryption = "instead, use 'c2s_require_encryption' and 's2s_require_encryption'";
vcard_compatibility = instead_use("community", "mod_compat_vcard");