aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-09-09 22:14:43 +0200
committerKim Alvefur <zash@zash.se>2021-09-09 22:14:43 +0200
commitf24aba7b1989c01faa23320e2ed4df16498d3043 (patch)
tree8722d8aefdb891a85a8eeb929808f305f25e768c
parent4f520714ce86828a20ab5358603e27dc86e1e0dd (diff)
downloadprosody-f24aba7b1989c01faa23320e2ed4df16498d3043.tar.gz
prosody-f24aba7b1989c01faa23320e2ed4df16498d3043.zip
mod_c2s: Rename Direct TLS listener 'c2s_direct_tls' for clarity
And to follow existing naming practices better than 'legacy_ssl' did.
-rw-r--r--doc/doap.xml2
-rw-r--r--plugins/mod_c2s.lua2
-rw-r--r--util/prosodyctl/check.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/doap.xml b/doc/doap.xml
index 191f4caa..bb8a0dd4 100644
--- a/doc/doap.xml
+++ b/doc/doap.xml
@@ -641,7 +641,7 @@
<xmpp:version>1.1.0</xmpp:version>
<xmpp:status>partial</xmpp:status>
<xmpp:since>0.2.0</xmpp:since>
- <xmpp:note>direct_tls_ports (formerly legacy_ssl_ports) for c2s and direct_tls_s2s_ports for s2s</xmpp:note>
+ <xmpp:note>c2s_direct_tls_ports (formerly legacy_ssl_ports) for c2s and direct_tls_s2s_ports for s2s</xmpp:note>
</xmpp:SupportedXep>
</implements>
<implements>
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 1f22d871..e97b3b3f 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -442,7 +442,7 @@ module:provides("net", {
});
module:provides("net", {
- name = "direct_tls";
+ name = "c2s_direct_tls";
listener = listener;
encryption = "ssl";
multiplex = {
diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua
index 0a136709..7b3da3ba 100644
--- a/util/prosodyctl/check.lua
+++ b/util/prosodyctl/check.lua
@@ -311,7 +311,7 @@ local function check(arg)
local ip = require "util.ip";
local c2s_ports = set.new(configmanager.get("*", "c2s_ports") or {5222});
local s2s_ports = set.new(configmanager.get("*", "s2s_ports") or {5269});
- local c2s_tls_ports = set.new(configmanager.get("*", "direct_tls_ports") or {});
+ local c2s_tls_ports = set.new(configmanager.get("*", "c2s_direct_tls_ports") or {});
local s2s_tls_ports = set.new(configmanager.get("*", "s2s_direct_tls_ports") or {});
local c2s_srv_required, s2s_srv_required, c2s_tls_srv_required, s2s_tls_srv_required;