From 4a5b4067a983ad128e4f89d9b0039f30167a3522 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 21 Mar 2017 15:18:35 +0100 Subject: util.dependencies: Give APT command for installing lua-sec --- util/dependencies.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/dependencies.lua b/util/dependencies.lua index 8c8e731c..de840241 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -93,7 +93,7 @@ local function check_dependencies() if not ssl then missingdep("LuaSec", { - ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu"; + ["Debian/Ubuntu"] = "sudo apt-get install lua-sec"; ["luarocks"] = "luarocks install luasec"; ["Source"] = "https://github.com/brunoos/luasec"; }, "SSL/TLS support will not be available"); -- cgit v1.2.3 From d496a96705c14722455f85f40f38b17fc5470606 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 22 Mar 2017 12:00:21 +0100 Subject: util.datamanager: Split long line [luacheck] --- util/datamanager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/datamanager.lua b/util/datamanager.lua index 2b47c3c4..d0a81e71 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -24,8 +24,10 @@ local t_insert = table.insert; local t_concat = table.concat; local envloadfile = require"util.envload".envloadfile; local serialize = require "util.serialization".serialize; -local path_separator = assert ( package.config:match ( "^([^\n]+)" ) , "package.config not in standard form" ) -- Extract directory seperator from package.config (an undocumented string that comes with lua) local lfs = require "lfs"; +-- Extract directory seperator from package.config (an undocumented string that comes with lua) +local path_separator = assert ( package.config:match ( "^([^\n]+)" ) , "package.config not in standard form" ) + local prosody = prosody; local raw_mkdir = lfs.mkdir; -- cgit v1.2.3 From 2e06e8e75d004d079ac264abc3f086051c4b62fb Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 22 Mar 2017 12:02:52 +0100 Subject: util.datamanager: Remove check for file non-existence since ENOENT tells us that already --- util/datamanager.lua | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'util') diff --git a/util/datamanager.lua b/util/datamanager.lua index d0a81e71..b825cb33 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -132,15 +132,8 @@ local function load(username, host, datastore) -- No such file, ok to ignore return nil; end - local mode = lfs.attributes(getpath(username, host, datastore), "mode"); - if not mode then - log("debug", "Assuming empty %s storage ('%s') for user: %s@%s", datastore, err, username or "nil", host or "nil"); - return nil; - else -- file exists, but can't be read - -- TODO more detailed error checking and logging? - log("error", "Failed to load %s storage ('%s') for user: %s@%s", datastore, err, username or "nil", host or "nil"); - return nil, "Error reading storage"; - end + log("error", "Failed to load %s storage ('%s') for user: %s@%s", datastore, err, username or "nil", host or "nil"); + return nil, "Error reading storage"; end local success, ret = pcall(data); @@ -306,15 +299,8 @@ local function list_load(username, host, datastore) -- No such file, ok to ignore return nil; end - local mode = lfs.attributes(getpath(username, host, datastore, "list"), "mode"); - if not mode then - log("debug", "Assuming empty %s storage ('%s') for user: %s@%s", datastore, err, username or "nil", host or "nil"); - return nil; - else -- file exists, but can't be read - -- TODO more detailed error checking and logging? - log("error", "Failed to load %s storage ('%s') for user: %s@%s", datastore, err, username or "nil", host or "nil"); - return nil, "Error reading storage"; - end + log("error", "Failed to load %s storage ('%s') for user: %s@%s", datastore, err, username or "nil", host or "nil"); + return nil, "Error reading storage"; end local success, ret = pcall(data); -- cgit v1.2.3