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 | d2d92d933717827460c637421172b410f574e619 (patch) | |
| tree | b1ae5f3567985e99fa359ae10fed5d9fdab85d91 /prosodyctl | |
| parent | 31895cd45fbb41608ae19a3c02013d5ee5263f38 (diff) | |
| parent | 376dd433962a1a897a239d06dbc91d3e03290fe3 (diff) | |
| download | prosody-d2d92d933717827460c637421172b410f574e619.tar.gz prosody-d2d92d933717827460c637421172b410f574e619.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) |