mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-04-09 01:25:58 +02:00
commit f01822fbfc
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
prosodyctl
View file

@ -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

2
tools/migration/migrator/prosody_sql.lua
View file

@ -161,7 +161,7 @@ local function writer(output, iter)
local insert_sql = "INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)";
return function(item)
if not item then return end -- end of input
if not item then assert(engine.conn:commit()) return end -- end of input
local host = item.host or "";
local user = item.user or "";
for store, data in pairs(item.stores) do