aboutsummaryrefslogtreecommitdiff
path: root/prosodyctl
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-09 01:25:58 +0200
committerKim Alvefur <zash@zash.se>2017-04-09 01:25:58 +0200
commit3b94e990719aa5339f4e5ad6fbcf3cf1a2382ec1 (patch)
tree426c7594744071edf6e44a26e6fd28ae24bf895d /prosodyctl
parent0564184df80410ccd09e747938f50c5ff3b6b57b (diff)
parenta94e455875e25523dc6d9124838f61f96d08673f (diff)
downloadprosody-im-server-3b94e990719aa5339f4e5ad6fbcf3cf1a2382ec1.tar
prosody-im-server-3b94e990719aa5339f4e5ad6fbcf3cf1a2382ec1.zip
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl7
1 files changed, 7 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index ba12ebe0..b7f0d06c 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -973,6 +973,13 @@ function commands.check(arg)
print(" For more information see https://prosody.im/doc/storage");
end
end
+ for host, config in pairs(config) do
+ if type(rawget(config, "storage")) == "string" and rawget(config, "default_storage") then
+ print("");
+ print(" The 'default_storage' option is not needed if 'storage' is set to a string.");
+ break;
+ end
+ end
local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
local ssl = dependencies.softreq"ssl";
if not ssl then