prosody
a7863f4aae65
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 8203:a7863f4aae65

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 29 Aug 2017 15:24:53 +0200
parent 8201:a0ad62a269df
parent 8202:85a60e863509
child 8253:3a6f5b0f56f0
comparison
equal deleted inserted replaced
8201:a0ad62a269df 8203:a7863f4aae65
249 249
250 local prosodyctl = require "util.prosodyctl" 250 local prosodyctl = require "util.prosodyctl"
251 local socket = require "socket" 251 local socket = require "socket"
252 252
253 local http = require "net.http" 253 local http = require "net.http"
254 local config_ssl = config.get("*", "ssl") 254 local config_ssl = config.get("*", "ssl") or {}
255 local https_client = config.get("*", "client_https_ssl") 255 local https_client = config.get("*", "client_https_ssl")
256 http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client", 256 http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
257 { capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client); 257 { capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);
258 258
259 ----------------------- 259 -----------------------