Merge 0.12->trunk
authorKim Alvefur <zash@zash.se>
Wed, 30 Aug 2023 11:09:12 +0200
changeset 13260 53708752cc5d
parent 13259 df96af198222 (current diff)
parent 13258 a2ba3f06dcf4 (diff)
child 13262 c8c0cfb7f5df
Merge 0.12->trunk
util/prosodyctl/check.lua
--- a/util/prosodyctl/check.lua	Sat Aug 26 15:10:58 2023 +0200
+++ b/util/prosodyctl/check.lua	Wed Aug 30 11:09:12 2023 +0200
@@ -369,7 +369,7 @@
 		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");