Software / code / prosody
Diff
prosodyctl @ 9710:8649a6b010e2
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 17 Dec 2018 15:42:54 +0100 |
| parent | 9709:f31ed70c993a |
| child | 9780:c7727c13260f |
| child | 9856:4be2af104bf0 |
line wrap: on
line diff
--- a/prosodyctl Sun Dec 16 22:59:14 2018 +0100 +++ b/prosodyctl Mon Dec 17 15:42:54 2018 +0100 @@ -812,6 +812,7 @@ "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings", "network_backend", "http_default_host", + "statistics_interval", "statistics", "statistics_config", }); local config = configmanager.getconfig(); -- Check that we have any global options (caused by putting a host at the top)
