prosody
76a8456cf1e2
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 7456:76a8456cf1e2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 12 Jun 2016 20:06:30 +0200
parent 7447:843fe134453e
parent 7455:82d8c11ab0cb
child 7494:f82356adcd71
comparison
equal deleted inserted replaced
7452:d916703d5e18 7456:76a8456cf1e2
972 print(" Remove '"..mod.."' from modules_enabled and instead add"); 972 print(" Remove '"..mod.."' from modules_enabled and instead add");
973 print(" storage = '"..mod:match("^storage_(.*)").."'"); 973 print(" storage = '"..mod:match("^storage_(.*)").."'");
974 print(" For more information see https://prosody.im/doc/storage"); 974 print(" For more information see https://prosody.im/doc/storage");
975 end 975 end
976 end 976 end
977 local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
977 local ssl = dependencies.softreq"ssl"; 978 local ssl = dependencies.softreq"ssl";
978 if not ssl then 979 if not ssl then
979 if not set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty() then 980 if not require_encryption then
980 print(""); 981 print("");
981 print(" You require encryption but LuaSec is not available."); 982 print(" You require encryption but LuaSec is not available.");
982 print(" Connections will fail."); 983 print(" Connections will fail.");
983 ok = false; 984 ok = false;
984 end 985 end
1004 print(" not support certificate validation, so s2s connections to/from "); 1005 print(" not support certificate validation, so s2s connections to/from ");
1005 print(" these domains will fail."); 1006 print(" these domains will fail.");
1006 ok = false; 1007 ok = false;
1007 end 1008 end
1008 end 1009 end
1010 elseif require_encryption and not all_modules:contains("tls") then
1011 print("");
1012 print(" You require encryption but mod_tls is not enabled.");
1013 print(" Connections will fail.");
1014 ok = false;
1009 end 1015 end
1010 1016
1011 print("Done.\n"); 1017 print("Done.\n");
1012 end 1018 end
1013 if not what or what == "dns" then 1019 if not what or what == "dns" then