# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1465754146 -7200
# Node ID 82d8c11ab0cbce230beefc0468deb820f1db9c13
# Parent  d10b4bfb20c51f813fa6daef8c55579530128ad6
prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)

diff -r d10b4bfb20c5 -r 82d8c11ab0cb prosodyctl
--- a/prosodyctl	Fri Jun 10 14:55:05 2016 +0200
+++ b/prosodyctl	Sun Jun 12 19:55:46 2016 +0200
@@ -974,9 +974,10 @@
 				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 @@
 					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");