From e64aed755afc05ffc3cb126185cb1902555c5281 Mon Sep 17 00:00:00 2001 From: Paul Aurich Date: Wed, 1 Apr 2015 13:30:31 -0700 Subject: prosodyctl: Document magic commit ID --- prosodyctl | 1 + 1 file changed, 1 insertion(+) (limited to 'prosodyctl') diff --git a/prosodyctl b/prosodyctl index abf9bf95..7c6b77d4 100755 --- a/prosodyctl +++ b/prosodyctl @@ -552,6 +552,7 @@ function commands.about(arg) if not hgid and hgrepo then return path.." - "..hgrepo .."!\n "; end + -- 010452cfaf53 is the first commit in the prosody-modules repository hgrepo = hgrepo == "010452cfaf53" and "prosody-modules"; return path..(hgid and " - "..(hgrepo or "HG").." rev: "..hgid or "") .."\n "; -- cgit v1.2.3 From 90aa3a710b37162abe64ad36a0af03cb29da5822 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 2 Apr 2015 14:31:41 +0200 Subject: prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ssl.x509 export dissapears in 97b1974 or 356e03a --- prosodyctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'prosodyctl') diff --git a/prosodyctl b/prosodyctl index 7c6b77d4..e8fca0ce 100755 --- a/prosodyctl +++ b/prosodyctl @@ -1094,7 +1094,7 @@ function commands.check(arg) local x509_verify_identity = require"util.x509".verify_identity; local ssl = dependencies.softreq"ssl"; -- local datetime_parse = require"util.datetime".parse_x509; - local load_cert = ssl and ssl.x509 and ssl.x509.load; + local load_cert = ssl and ssl.loadcertificate; -- or ssl.cert_from_pem if not ssl then print("LuaSec not available, can't perform certificate checks") -- cgit v1.2.3