aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-06-12 19:55:46 +0200
committerKim Alvefur <zash@zash.se>2016-06-12 19:55:46 +0200
commit41fc70c7cfc60fc8060b8e64ea5706ae1e5de6b8 (patch)
tree9ddff31a23648c7400f1ec22b32da23756d45588
parent331c8a1358f7add25142ada7f3293c289dafde0d (diff)
downloadprosody-41fc70c7cfc60fc8060b8e64ea5706ae1e5de6b8.tar.gz
prosody-41fc70c7cfc60fc8060b8e64ea5706ae1e5de6b8.zip
prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)
-rwxr-xr-xprosodyctl8
1 files changed, 7 insertions, 1 deletions
diff --git a/prosodyctl b/prosodyctl
index 8ada3b9b..226ff2cf 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -974,9 +974,10 @@ function commands.check(arg)
print(" For more information see https://prosody.im/doc/storage");
end
end
+ local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
local ssl = dependencies.softreq"ssl";
if not ssl then
- if not set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty() then
+ if not require_encryption then
print("");
print(" You require encryption but LuaSec is not available.");
print(" Connections will fail.");
@@ -1006,6 +1007,11 @@ function commands.check(arg)
ok = false;
end
end
+ elseif require_encryption and not all_modules:contains("tls") then
+ print("");
+ print(" You require encryption but mod_tls is not enabled.");
+ print(" Connections will fail.");
+ ok = false;
end
print("Done.\n");