X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosodyctl;h=226ff2cf48b370ea991b3a63228191074243c5bf;hb=4882fa95831128e66de10b0b5d34adb96e238027;hp=c8366faf9ae68193ccc98767f8ea68fd62a4f047;hpb=d091b0767be48c0ecc94cf333b6a3cf46c44105e;p=prosody.git

diff --git a/prosodyctl b/prosodyctl
index c8366faf..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");
@@ -1261,13 +1267,13 @@ function commands.check(arg)
 						end
 						if config.get(host, "component_module") == nil
 							and not x509_verify_identity(host, "_xmpp-client", cert) then
-							print("    Not vaild for client connections to "..host..".")
+							print("    Not valid for client connections to "..host..".")
 							cert_ok = false
 						end
 						if (not (config.get(host, "anonymous_login")
 							or config.get(host, "authentication") == "anonymous"))
 							and not x509_verify_identity(host, "_xmpp-server", cert) then
-							print("    Not vaild for server-to-server connections to "..host..".")
+							print("    Not valid for server-to-server connections to "..host..".")
 							cert_ok = false
 						end
 					end