Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2017-03-23 01:30:58 +01:00
commit 597d317427
7 changed files with 13 additions and 24 deletions

View file

@ -93,7 +93,7 @@ local function check_dependencies()
if not ssl then
missingdep("LuaSec", {
["Debian/Ubuntu"] = "https://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");