Software /
code /
prosody
Diff
prosodyctl @ 8068:5abb6bc45edd
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sun, 09 Apr 2017 01:25:58 +0200 |
parent | 8015:ecb110f45c92 |
parent | 8067:91550b6f93d2 |
child | 8101:3e25d96571d1 |
line wrap: on
line diff
--- a/prosodyctl Sat Apr 08 00:48:15 2017 +0200 +++ b/prosodyctl Sun Apr 09 01:25:58 2017 +0200 @@ -973,6 +973,13 @@ 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