diff options
author | Kim Alvefur <zash@zash.se> | 2021-05-27 12:51:07 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2021-05-27 12:51:07 +0200 |
commit | da83a7481038dc41cb6da515d013e627bf286862 (patch) | |
tree | 9a344799eae2140ad330da2d12b35d253c5ea715 /util/prosodyctl/check.lua | |
parent | 4395895fef2e69d1f71d351bbecff7837672db73 (diff) | |
parent | 13c5a2359d83818bfeae08b757c53fd34ed05ad8 (diff) | |
download | prosody-da83a7481038dc41cb6da515d013e627bf286862.tar.gz prosody-da83a7481038dc41cb6da515d013e627bf286862.zip |
Merge 0.11->trunk
Diffstat (limited to 'util/prosodyctl/check.lua')
-rw-r--r-- | util/prosodyctl/check.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua index 905703d2..f3bae1a5 100644 --- a/util/prosodyctl/check.lua +++ b/util/prosodyctl/check.lua @@ -47,7 +47,7 @@ local function check(arg) "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings", "network_backend", "http_default_host", "statistics_interval", "statistics", "statistics_config", - "plugin_server", "installer_plugin_path", "gc" + "plugin_server", "installer_plugin_path", "gc", "limits", }); local config = configmanager.getconfig(); -- Check that we have any global options (caused by putting a host at the top) |