Software / code / prosody
Diff
prosodyctl @ 6767:d01c29b62b16
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 09 Jul 2015 00:14:27 +0100 |
| parent | 6751:18f18bceb662 |
| child | 6784:4da860edc27c |
line wrap: on
line diff
--- a/prosodyctl Sun Jul 05 18:00:05 2015 +0200 +++ b/prosodyctl Thu Jul 09 00:14:27 2015 +0100 @@ -841,7 +841,8 @@ }); 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)
