aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-08-29 15:23:39 +0200
committerKim Alvefur <zash@zash.se>2017-08-29 15:23:39 +0200
commitfb7792a6d38c9bd82fa84f03972862e45b9a160a (patch)
treeaee951cae280cf5c1bd83385cfbac8cc7bf05250
parent672ab9595bcadcefa5c8725fd0ba4d7d6089b4f5 (diff)
downloadprosody-fb7792a6d38c9bd82fa84f03972862e45b9a160a.tar.gz
prosody-fb7792a6d38c9bd82fa84f03972862e45b9a160a.zip
prosody, prosodyctl: Fix traceback if ssl config is missing (thanks lookshe and sol)
-rwxr-xr-xprosody2
-rwxr-xr-xprosodyctl2
2 files changed, 2 insertions, 2 deletions
diff --git a/prosody b/prosody
index 7d9e76b8..a9ef6117 100755
--- a/prosody
+++ b/prosody
@@ -324,7 +324,7 @@ function load_secondary_libraries()
end});
local http = require "net.http"
- local config_ssl = config.get("*", "ssl")
+ local config_ssl = config.get("*", "ssl") or {}
local https_client = config.get("*", "client_https_ssl")
http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
{ capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);
diff --git a/prosodyctl b/prosodyctl
index cd58212e..ce81877d 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -253,7 +253,7 @@ local prosodyctl = require "util.prosodyctl"
local socket = require "socket"
local http = require "net.http"
-local config_ssl = config.get("*", "ssl")
+local config_ssl = config.get("*", "ssl") or {}
local https_client = config.get("*", "client_https_ssl")
http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
{ capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);