Software /
code /
prosody
Diff
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 |
line wrap: on
line diff
--- a/prosodyctl Mon Dec 30 09:54:49 2019 +0100 +++ b/prosodyctl Tue Dec 31 02:52:12 2019 +0100 @@ -973,9 +973,15 @@ end end if all_modules:contains("vcard") and all_modules:contains("vcard_legacy") then + print(""); print(" Both mod_vcard_legacy and mod_vcard are enabled but they conflict"); print(" with each other. Remove one."); end + if all_modules:contains("pep") and all_modules:contains("pep_simple") then + print(""); + print(" Both mod_pep_simple and mod_pep are enabled but they conflict"); + print(" with each other. Remove one."); + end for host, host_config in pairs(config) do --luacheck: ignore 213/host if type(rawget(host_config, "storage")) == "string" and rawget(host_config, "default_storage") then print("");