prosody
c78f8f8f4434
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 6614:c78f8f8f4434

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 03 Apr 2015 06:39:28 +0200
parent 6612:6cc48b51d699
child 6637:ecc039288edc
comparison
equal deleted inserted replaced
6609:d2faaaca695d 6614:c78f8f8f4434
550 path = config.resolve_relative_path(pwd, path); 550 path = config.resolve_relative_path(pwd, path);
551 local hgid, hgrepo = hg.check_id(path); 551 local hgid, hgrepo = hg.check_id(path);
552 if not hgid and hgrepo then 552 if not hgid and hgrepo then
553 return path.." - "..hgrepo .."!\n "; 553 return path.." - "..hgrepo .."!\n ";
554 end 554 end
555 -- 010452cfaf53 is the first commit in the prosody-modules repository
555 hgrepo = hgrepo == "010452cfaf53" and "prosody-modules"; 556 hgrepo = hgrepo == "010452cfaf53" and "prosody-modules";
556 return path..(hgid and " - "..(hgrepo or "HG").." rev: "..hgid or "") 557 return path..(hgid and " - "..(hgrepo or "HG").." rev: "..hgid or "")
557 .."\n "; 558 .."\n ";
558 end))); 559 end)));
559 print(""); 560 print("");
1091 local cert_ok; 1092 local cert_ok;
1092 print"Checking certificates..." 1093 print"Checking certificates..."
1093 local x509_verify_identity = require"util.x509".verify_identity; 1094 local x509_verify_identity = require"util.x509".verify_identity;
1094 local ssl = dependencies.softreq"ssl"; 1095 local ssl = dependencies.softreq"ssl";
1095 -- local datetime_parse = require"util.datetime".parse_x509; 1096 -- local datetime_parse = require"util.datetime".parse_x509;
1096 local load_cert = ssl and ssl.x509 and ssl.x509.load; 1097 local load_cert = ssl and ssl.loadcertificate;
1097 -- or ssl.cert_from_pem 1098 -- or ssl.cert_from_pem
1098 if not ssl then 1099 if not ssl then
1099 print("LuaSec not available, can't perform certificate checks") 1100 print("LuaSec not available, can't perform certificate checks")
1100 if what == "certs" then cert_ok = false end 1101 if what == "certs" then cert_ok = false end
1101 elseif not load_cert then 1102 elseif not load_cert then