diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-07-09 00:14:27 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-07-09 00:14:27 +0100 |
| commit | f1c16522876601ffd9c74af2e6647836150de40c (patch) | |
| tree | b1ae5f3567985e99fa359ae10fed5d9fdab85d91 /prosodyctl | |
| parent | 5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad (diff) | |
| parent | c38e034cf497a13f5f813b7d5217102ffb3677d9 (diff) | |
| download | prosody-f1c16522876601ffd9c74af2e6647836150de40c.tar.gz prosody-f1c16522876601ffd9c74af2e6647836150de40c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
| -rwxr-xr-x | prosodyctl | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -841,7 +841,8 @@ function commands.check(arg) }); local known_global_options = set.new({ "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", - "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings" + "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings", + "network_backend", "http_default_host", }); local config = config.getconfig(); -- Check that we have any global options (caused by putting a host at the top) |