aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-12-31 02:52:12 +0100
committerKim Alvefur <zash@zash.se>2019-12-31 02:52:12 +0100
commit0f26f2d5c92e5fa7102ada3831987821dcf3a6c0 (patch)
tree2021f270b83854bcc28be7062d48b6681a2bee1f
parentadc4440fd83a3b9124f91ad38eb8aa2c933284cc (diff)
parent941b35fe8a1f2b85bfc7928c743f02bdb55a151b (diff)
downloadprosody-0f26f2d5c92e5fa7102ada3831987821dcf3a6c0.tar.gz
prosody-0f26f2d5c92e5fa7102ada3831987821dcf3a6c0.zip
Merge 0.11->trunk
-rwxr-xr-xprosodyctl6
1 files changed, 6 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index 5243c366..9e98ae5c 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -973,9 +973,15 @@ function commands.check(arg)
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("");