prosody
16099e8964d8
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 10579:16099e8964d8

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 31 Dec 2019 02:52:12 +0100
parent 10434:8f709577fe8e
parent 10578:419ac5ef2d3d
child 10609:f35cbfe546d1
comparison
equal deleted inserted replaced
10576:f88f1151bc72 10579:16099e8964d8
971 print(" storage = '"..mod:match("^storage_(.*)").."'"); 971 print(" storage = '"..mod:match("^storage_(.*)").."'");
972 print(" For more information see https://prosody.im/doc/storage"); 972 print(" For more information see https://prosody.im/doc/storage");
973 end 973 end
974 end 974 end
975 if all_modules:contains("vcard") and all_modules:contains("vcard_legacy") then 975 if all_modules:contains("vcard") and all_modules:contains("vcard_legacy") then
976 print("");
976 print(" Both mod_vcard_legacy and mod_vcard are enabled but they conflict"); 977 print(" Both mod_vcard_legacy and mod_vcard are enabled but they conflict");
978 print(" with each other. Remove one.");
979 end
980 if all_modules:contains("pep") and all_modules:contains("pep_simple") then
981 print("");
982 print(" Both mod_pep_simple and mod_pep are enabled but they conflict");
977 print(" with each other. Remove one."); 983 print(" with each other. Remove one.");
978 end 984 end
979 for host, host_config in pairs(config) do --luacheck: ignore 213/host 985 for host, host_config in pairs(config) do --luacheck: ignore 213/host
980 if type(rawget(host_config, "storage")) == "string" and rawget(host_config, "default_storage") then 986 if type(rawget(host_config, "storage")) == "string" and rawget(host_config, "default_storage") then
981 print(""); 987 print("");