X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosodyctl;h=6c4b148a927105b37e8eb3a54a6fe61b2907c245;hb=0c2073da4938f4a63daa24042f68d8892e3ff029;hp=c7daceac579184a4c3192f6e38ff7f54549d9d17;hpb=931c97fd31833e14325bff899fdbefa5f4cd9896;p=prosody.git

diff --git a/prosodyctl b/prosodyctl
index c7daceac..6c4b148a 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -532,17 +532,31 @@ function commands.about(arg)
 	end
 	
 	local pwd = ".";
+	local lfs = require "lfs";
 	local array = require "util.array";
 	local keys = require "util.iterators".keys;
+	local hg = require"util.mercurial";
 	local relpath = config.resolve_relative_path;
 	
 	print("Prosody "..(prosody.version or "(unknown version)"));
 	print("");
 	print("# Prosody directories");
 	print("Data directory:     "..relpath(pwd, data_path));
-	print("Plugin directory:   "..relpath(pwd, CFG_PLUGINDIR or "."));
 	print("Config directory:   "..relpath(pwd, CFG_CONFIGDIR or "."));
 	print("Source directory:   "..relpath(pwd, CFG_SOURCEDIR or "."));
+	print("Plugin directories:")
+	print("  "..(prosody.paths.plugins:gsub("([^;]+);?", function(path)
+			local opath = path;
+			path = config.resolve_relative_path(pwd, path);
+			local hgid, hgrepo = hg.check_id(path);
+			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  ";
+		end)));
 	print("");
 	print("# Lua environment");
 	print("Lua version:             ", _G._VERSION);
@@ -564,6 +578,8 @@ function commands.about(arg)
 	print("");
 	print("# Lua module versions");
 	local module_versions, longest_name = {}, 8;
+	local luaevent =dependencies.softreq"luaevent";
+	local ssl = dependencies.softreq"ssl";
 	for name, module in pairs(package.loaded) do
 		if type(module) == "table" and rawget(module, "_VERSION")
 		and name ~= "_G" and not name:match("%.") then
@@ -1080,7 +1096,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")
@@ -1132,7 +1148,7 @@ function commands.check(arg)
 						end
 						if (not (config.get(host, "anonymous_login")
 							or config.get(host, "authentication") == "anonymous"))
-							and not x509_verify_identity(host, "_xmpp-client", cert) then
+							and not x509_verify_identity(host, "_xmpp-server", cert) then
 							print("    Not vaild for server-to-server connections to "..host..".")
 							cert_ok = false
 						end