projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
prosodyctl
diff --git
a/prosodyctl
b/prosodyctl
index 4a6ce44efd68acfe4b33fea8250e119cc9eb97cb..15d40f26a7b66e16bb88010b6587be5d6f8b01a9 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-974,9
+974,10
@@
function commands.check(arg)
print(" For more information see https://prosody.im/doc/storage");
end
end
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
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.");
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
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");
end
print("Done.\n");