Merge 0.11->trunk

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("");