diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-07-06 17:07:05 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-07-06 17:07:05 +0100 |
| commit | 31770d0b8f6687434de63a8a41bda018bebd203b (patch) | |
| tree | 116641904bf26766fe52624f4ef7af24d77ae2ee /prosodyctl | |
| parent | 2aae33a4f0f71c25e6d4aeb9a17c6eb092f7c4ca (diff) | |
| parent | 19ac6e09eb3da1e0674ee4cb6cffc2cd88a64b43 (diff) | |
| download | prosody-31770d0b8f6687434de63a8a41bda018bebd203b.tar.gz prosody-31770d0b8f6687434de63a8a41bda018bebd203b.zip | |
Merge with 0.10
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) |