From: Kim Alvefur <zash@zash.se>
Date: Sun, 12 Jun 2016 17:55:46 +0000 (+0200)
Subject: prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=feb99f621e76b06014ca7be9508834ffb911dfa4

prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)
---

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");