aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-26 20:08:48 +0100
committerKim Alvefur <zash@zash.se>2016-11-26 20:08:48 +0100
commit710d550957d14af969ffa2b942f23dd5d9c7a9d9 (patch)
treecab2303579e4d8482ccedd28be0b7170e9fb9989
parent561922914bcfcaf5b6fad981a28962833748145a (diff)
downloadprosody-710d550957d14af969ffa2b942f23dd5d9c7a9d9.tar.gz
prosody-710d550957d14af969ffa2b942f23dd5d9c7a9d9.zip
core.certmanager: Translate "no start line" to something friendlier (thanks santiago)
-rw-r--r--core/certmanager.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 3872bd9a..12ae94b1 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -184,9 +184,12 @@ local function create_context(host, mode, ...)
err = err or "invalid ssl config"
local file = err:match("^error loading (.-) %(");
if file then
+ local typ;
if file == "private key" then
+ typ = file;
file = user_ssl_config.key or "your private key";
elseif file == "certificate" then
+ typ = file;
file = user_ssl_config.certificate or "your certificate file";
end
local reason = err:match("%((.+)%)$") or "some reason";
@@ -196,6 +199,8 @@ local function create_context(host, mode, ...)
reason = "Check that the path is correct, and the file exists.";
elseif reason == "system lib" then
reason = "Previous error (see logs), or other system error.";
+ elseif reason == "no start line" then
+ reason = "Check that the file contains a "..(typ or file);
elseif reason == "(null)" or not reason then
reason = "Check that the file exists and the permissions are correct";
else