prosody
5abb6bc45edd
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 8068:5abb6bc45edd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Apr 2017 01:25:58 +0200
parent 8015:ecb110f45c92
parent 8067:91550b6f93d2
child 8101:3e25d96571d1
comparison
equal deleted inserted replaced
8065:36d9c1226fbc 8068:5abb6bc45edd
969 print(" storage modules should not be added to modules_enabled,"); 969 print(" storage modules should not be added to modules_enabled,");
970 print(" but be specified in the 'storage' option."); 970 print(" but be specified in the 'storage' option.");
971 print(" Remove '"..mod.."' from modules_enabled and instead add"); 971 print(" Remove '"..mod.."' from modules_enabled and instead add");
972 print(" storage = '"..mod:match("^storage_(.*)").."'"); 972 print(" storage = '"..mod:match("^storage_(.*)").."'");
973 print(" For more information see https://prosody.im/doc/storage"); 973 print(" For more information see https://prosody.im/doc/storage");
974 end
975 end
976 for host, config in pairs(config) do
977 if type(rawget(config, "storage")) == "string" and rawget(config, "default_storage") then
978 print("");
979 print(" The 'default_storage' option is not needed if 'storage' is set to a string.");
980 break;
974 end 981 end
975 end 982 end
976 local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty(); 983 local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
977 local ssl = dependencies.softreq"ssl"; 984 local ssl = dependencies.softreq"ssl";
978 if not ssl then 985 if not ssl then