prosody
85a60e863509
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 8202:85a60e863509

prosody, prosodyctl: Fix traceback if ssl config is missing (thanks lookshe and sol)
author Kim Alvefur <zash@zash.se>
date Tue, 29 Aug 2017 15:23:39 +0200
parent 8198:db82ce3decee
child 8203:a7863f4aae65
child 8247:2c386ee5cd5c
comparison
equal deleted inserted replaced
8200:e92585ab4998 8202:85a60e863509
251 251
252 local prosodyctl = require "util.prosodyctl" 252 local prosodyctl = require "util.prosodyctl"
253 local socket = require "socket" 253 local socket = require "socket"
254 254
255 local http = require "net.http" 255 local http = require "net.http"
256 local config_ssl = config.get("*", "ssl") 256 local config_ssl = config.get("*", "ssl") or {}
257 local https_client = config.get("*", "client_https_ssl") 257 local https_client = config.get("*", "client_https_ssl")
258 http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client", 258 http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
259 { capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client); 259 { capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);
260 260
261 ----------------------- 261 -----------------------