Software / code / prosody
Changeset
10579:16099e8964d8
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 31 Dec 2019 02:52:12 +0100 |
| parents | 10576:f88f1151bc72 (current diff) 10578:419ac5ef2d3d (diff) |
| children | 10580:b7c5d7bae4ef |
| files | prosodyctl |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
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("");
