prosody
3cc2bc9c1bff
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 6752:3cc2bc9c1bff

Merge with 0.10
author Matthew Wild <mwild1@gmail.com>
date Mon, 06 Jul 2015 17:07:05 +0100
parent 6751:18f18bceb662
child 6784:4da860edc27c
comparison
equal deleted inserted replaced
6750:2a2eb30b1ed4 6752:3cc2bc9c1bff
839 local deprecated = set.new({ 839 local deprecated = set.new({
840 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption", 840 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
841 }); 841 });
842 local known_global_options = set.new({ 842 local known_global_options = set.new({
843 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", 843 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
844 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings" 844 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
845 "network_backend", "http_default_host",
845 }); 846 });
846 local config = config.getconfig(); 847 local config = config.getconfig();
847 -- Check that we have any global options (caused by putting a host at the top) 848 -- Check that we have any global options (caused by putting a host at the top)
848 if it.count(it.filter("log", pairs(config["*"]))) == 0 then 849 if it.count(it.filter("log", pairs(config["*"]))) == 0 then
849 ok = false; 850 ok = false;