Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Sun, 26 Oct 2014 20:58:02 +0100
parent: 6501:71b6e8b48a12
child: 6584:c3a56f8847ac
--- a/prosodyctl	Wed Oct 22 16:00:40 2014 -0400
+++ b/prosodyctl	Sun Oct 26 20:58:02 2014 +0100
@@ -552,7 +552,7 @@
 		print("  "..path);
 	end
 	print("");
-	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(luarocks.cfg.program_version or "2.x+")..")")
+	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")")
 		or (pcall(require, "luarocks.require") and "Installed (1.x)")
 		or "Not installed";
 	print("LuaRocks:        ", luarocks_status);
@@ -816,7 +816,7 @@
 	if not what or what == "config" then
 		print("Checking config...");
 		local deprecated = set.new({
-			"bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login",
+			"bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
 		});
 		local known_global_options = set.new({
 			"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",