aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-12-31 02:48:49 +0100
committerKim Alvefur <zash@zash.se>2019-12-31 02:48:49 +0100
commita7809d953e695c3bdd5d4b40f1d3794a1f3ddd80 (patch)
treeceb4cae7370d2f03ab9399c8e6e7c20a167c272f
parentbb3d150756001ccc5a8e0721b7f242e78d1a0ae0 (diff)
downloadprosody-a7809d953e695c3bdd5d4b40f1d3794a1f3ddd80.tar.gz
prosody-a7809d953e695c3bdd5d4b40f1d3794a1f3ddd80.zip
prosodyctl check: Warn about conflict between mod_pep and mod_pep_simple
Related #1483
-rwxr-xr-xprosodyctl5
1 files changed, 5 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index a732a73e..3242218d 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -937,6 +937,11 @@ function commands.check(arg)
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("");