prosody
8fed6ea12098
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 6502:8fed6ea12098

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
comparison
equal deleted inserted replaced
6485:4224abbf0fdd 6502:8fed6ea12098
550 print("Lua C module search paths:"); 550 print("Lua C module search paths:");
551 for path in package.cpath:gmatch("[^;]+") do 551 for path in package.cpath:gmatch("[^;]+") do
552 print(" "..path); 552 print(" "..path);
553 end 553 end
554 print(""); 554 print("");
555 local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(luarocks.cfg.program_version or "2.x+")..")") 555 local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")")
556 or (pcall(require, "luarocks.require") and "Installed (1.x)") 556 or (pcall(require, "luarocks.require") and "Installed (1.x)")
557 or "Not installed"; 557 or "Not installed";
558 print("LuaRocks: ", luarocks_status); 558 print("LuaRocks: ", luarocks_status);
559 print(""); 559 print("");
560 print("# Lua module versions"); 560 print("# Lua module versions");
814 end 814 end
815 end 815 end
816 if not what or what == "config" then 816 if not what or what == "config" then
817 print("Checking config..."); 817 print("Checking config...");
818 local deprecated = set.new({ 818 local deprecated = set.new({
819 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", 819 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
820 }); 820 });
821 local known_global_options = set.new({ 821 local known_global_options = set.new({
822 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", 822 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
823 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings" 823 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings"
824 }); 824 });