From 2f7189e8ff3dcbb27310f56194445cf0ada52af3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 14 Sep 2021 02:03:50 +0200 Subject: util.prosodyctl.check: Nudge towards plural port options The singulars are supposed to be deprecated --- util/prosodyctl/check.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util/prosodyctl/check.lua') diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua index 92e0a0e8..7ece1069 100644 --- a/util/prosodyctl/check.lua +++ b/util/prosodyctl/check.lua @@ -103,11 +103,13 @@ local function check(arg) require_encryption = "use 'c2s_require_encryption' and 's2s_require_encryption'", vcard_compatibility = "use 'mod_compat_vcard' from prosody-modules", }; + -- FIXME all the singular _port and _interface options are supposed to be deprecated too local deprecated_ports = { bosh = "http", legacy_ssl = "c2s_direct_tls" }; local port_suffixes = set.new({ "port", "ports", "interface", "interfaces", "ssl" }); for port, replacement in pairs(deprecated_ports) do for suffix in port_suffixes do - deprecated_replacements[port.."_"..suffix] = "use '"..replacement.."_"..suffix.."'" + local rsuffix = (suffix == "port" or suffix == "interface") and suffix.."s" or suffix; + deprecated_replacements[port.."_"..suffix] = "use '"..replacement.."_"..rsuffix.."'" end end local deprecated = set.new(array.collect(it.keys(deprecated_replacements))); -- cgit v1.2.3