mirror of
https://github.com/bjc/prosody.git
synced 2025-04-04 13:47:41 +03:00
util.dependencies, prosody, prosodyctl: Give util.dependencies a check_dependencies() function so the caller can decide what to do when dependencies aren't met - update prosody/prosodyctl for this change
This commit is contained in:
Matthew Wild
parent
74ceb83cca
commit
08284a586e
3 changed files with 95 additions and 85 deletions
4
prosody
4
prosody
|
|
@ -114,7 +114,9 @@ function load_libraries()
|
||||||
require "core.loggingmanager"
|
require "core.loggingmanager"
|
||||||
|
|
||||||
-- Check runtime dependencies
|
-- Check runtime dependencies
|
||||||
require "util.dependencies"
|
if not require "util.dependencies".check_dependencies() then
|
||||||
|
os.exit(1);
|
||||||
|
end
|
||||||
|
|
||||||
-- Load socket framework
|
-- Load socket framework
|
||||||
server = require "net.server"
|
server = require "net.server"
|
||||||
|
|
|
||||||
|
|
@ -29,10 +29,13 @@ if CFG_DATADIR then
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if not require "util.dependencies".check_dependencies() then
|
||||||
|
os.exit(1);
|
||||||
|
end
|
||||||
|
|
||||||
-- Required to be able to find packages installed with luarocks
|
-- Required to be able to find packages installed with luarocks
|
||||||
pcall(require, "luarocks.require")
|
pcall(require, "luarocks.require")
|
||||||
|
|
||||||
require "util.dependencies"
|
|
||||||
|
|
||||||
config = require "core.configmanager"
|
config = require "core.configmanager"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,11 @@
|
||||||
-- COPYING file in the source package for more information.
|
-- COPYING file in the source package for more information.
|
||||||
--
|
--
|
||||||
|
|
||||||
|
module("dependencies", package.seeall)
|
||||||
|
|
||||||
local fatal;
|
function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end
|
||||||
|
|
||||||
local function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end
|
function missingdep(name, sources, msg)
|
||||||
|
|
||||||
local function missingdep(name, sources, msg)
|
|
||||||
print("");
|
print("");
|
||||||
print("**************************");
|
print("**************************");
|
||||||
print("Prosody was unable to find "..tostring(name));
|
print("Prosody was unable to find "..tostring(name));
|
||||||
|
|
@ -31,89 +30,95 @@ local function missingdep(name, sources, msg)
|
||||||
print("");
|
print("");
|
||||||
end
|
end
|
||||||
|
|
||||||
local lxp = softreq "lxp"
|
function check_dependencies()
|
||||||
|
local fatal;
|
||||||
if not lxp then
|
|
||||||
missingdep("luaexpat", {
|
|
||||||
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
|
|
||||||
["luarocks"] = "luarocks install luaexpat";
|
|
||||||
["Source"] = "http://www.keplerproject.org/luaexpat/";
|
|
||||||
});
|
|
||||||
fatal = true;
|
|
||||||
end
|
|
||||||
|
|
||||||
local socket = softreq "socket"
|
|
||||||
|
|
||||||
if not socket then
|
|
||||||
missingdep("luasocket", {
|
|
||||||
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
|
|
||||||
["luarocks"] = "luarocks install luasocket";
|
|
||||||
["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/";
|
|
||||||
});
|
|
||||||
fatal = true;
|
|
||||||
end
|
|
||||||
|
|
||||||
local lfs, err = softreq "lfs"
|
local lxp = softreq "lxp"
|
||||||
if not lfs then
|
|
||||||
missingdep("luafilesystem", {
|
if not lxp then
|
||||||
["luarocks"] = "luarocks install luafilesystem";
|
missingdep("luaexpat", {
|
||||||
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-filesystem0";
|
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
|
||||||
["Source"] = "http://www.keplerproject.org/luafilesystem/";
|
["luarocks"] = "luarocks install luaexpat";
|
||||||
});
|
["Source"] = "http://www.keplerproject.org/luaexpat/";
|
||||||
fatal = true;
|
});
|
||||||
end
|
fatal = true;
|
||||||
|
end
|
||||||
local ssl = softreq "ssl"
|
|
||||||
|
local socket = softreq "socket"
|
||||||
if not ssl then
|
|
||||||
if config.get("*", "core", "run_without_ssl") then
|
if not socket then
|
||||||
log("warn", "Running without SSL support because run_without_ssl is defined in the config");
|
missingdep("luasocket", {
|
||||||
|
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
|
||||||
|
["luarocks"] = "luarocks install luasocket";
|
||||||
|
["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/";
|
||||||
|
});
|
||||||
|
fatal = true;
|
||||||
|
end
|
||||||
|
|
||||||
|
local lfs, err = softreq "lfs"
|
||||||
|
if not lfs then
|
||||||
|
missingdep("luafilesystem", {
|
||||||
|
["luarocks"] = "luarocks install luafilesystem";
|
||||||
|
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-filesystem0";
|
||||||
|
["Source"] = "http://www.keplerproject.org/luafilesystem/";
|
||||||
|
});
|
||||||
|
fatal = true;
|
||||||
|
end
|
||||||
|
|
||||||
|
local ssl = softreq "ssl"
|
||||||
|
|
||||||
|
if not ssl then
|
||||||
|
if config.get("*", "core", "run_without_ssl") then
|
||||||
|
log("warn", "Running without SSL support because run_without_ssl is defined in the config");
|
||||||
|
else
|
||||||
|
missingdep("LuaSec", {
|
||||||
|
["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
|
||||||
|
["luarocks"] = "luarocks install luasec";
|
||||||
|
["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
|
||||||
|
}, "SSL/TLS support will not be available");
|
||||||
|
end
|
||||||
else
|
else
|
||||||
missingdep("LuaSec", {
|
local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
|
||||||
["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
|
if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then
|
||||||
["luarocks"] = "luarocks install luasec";
|
log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
|
||||||
["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
|
end
|
||||||
}, "SSL/TLS support will not be available");
|
|
||||||
end
|
end
|
||||||
else
|
|
||||||
local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)");
|
local encodings, err = softreq "util.encodings"
|
||||||
if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then
|
if not encodings then
|
||||||
log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
|
if err:match("not found") then
|
||||||
|
missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/";
|
||||||
|
["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so";
|
||||||
|
});
|
||||||
|
else
|
||||||
|
print "***********************************"
|
||||||
|
print("util/encodings couldn't be loaded. Check that you have a recent version of libidn");
|
||||||
|
print ""
|
||||||
|
print("The full error was:");
|
||||||
|
print(err)
|
||||||
|
print "***********************************"
|
||||||
|
end
|
||||||
|
fatal = true;
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local hashes, err = softreq "util.hashes"
|
||||||
|
if not hashes then
|
||||||
|
if err:match("not found") then
|
||||||
|
missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/";
|
||||||
|
["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so";
|
||||||
|
});
|
||||||
|
else
|
||||||
|
print "***********************************"
|
||||||
|
print("util/hashes couldn't be loaded. Check that you have a recent version of OpenSSL (libcrypto in particular)");
|
||||||
|
print ""
|
||||||
|
print("The full error was:");
|
||||||
|
print(err)
|
||||||
|
print "***********************************"
|
||||||
|
end
|
||||||
|
fatal = true;
|
||||||
|
end
|
||||||
|
return not fatal;
|
||||||
end
|
end
|
||||||
|
|
||||||
local encodings, err = softreq "util.encodings"
|
|
||||||
if not encodings then
|
|
||||||
if err:match("not found") then
|
|
||||||
missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/";
|
|
||||||
["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so";
|
|
||||||
});
|
|
||||||
else
|
|
||||||
print "***********************************"
|
|
||||||
print("util/encodings couldn't be loaded. Check that you have a recent version of libidn");
|
|
||||||
print ""
|
|
||||||
print("The full error was:");
|
|
||||||
print(err)
|
|
||||||
print "***********************************"
|
|
||||||
end
|
|
||||||
fatal = true;
|
|
||||||
end
|
|
||||||
|
|
||||||
local hashes, err = softreq "util.hashes"
|
return _M;
|
||||||
if not hashes then
|
|
||||||
if err:match("not found") then
|
|
||||||
missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/";
|
|
||||||
["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so";
|
|
||||||
});
|
|
||||||
else
|
|
||||||
print "***********************************"
|
|
||||||
print("util/hashes couldn't be loaded. Check that you have a recent version of OpenSSL (libcrypto in particular)");
|
|
||||||
print ""
|
|
||||||
print("The full error was:");
|
|
||||||
print(err)
|
|
||||||
print "***********************************"
|
|
||||||
end
|
|
||||||
fatal = true;
|
|
||||||
end
|
|
||||||
|
|
||||||
if fatal then os.exit(1); end
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue