diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
| commit | 763567fa0236b0b80e0271ed1d3325501b979ee1 (patch) | |
| tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /prosodyctl | |
| parent | ff41d8ed2af5324b8f439a6864e41505ab778080 (diff) | |
| parent | 29326acffa1d582bed7759e6302d2c4b4bced884 (diff) | |
| download | prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.tar.gz prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
| -rwxr-xr-x | prosodyctl | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -552,7 +552,7 @@ function commands.about(arg) 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 @@ function commands.check(arg) 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", |