37 end |
37 end |
38 end |
38 end |
39 if not what or what == "config" then |
39 if not what or what == "config" then |
40 print("Checking config..."); |
40 print("Checking config..."); |
41 local deprecated = set.new({ |
41 local deprecated = set.new({ |
42 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption", |
42 "anonymous_login", |
43 "vcard_compatibility", "cross_domain_bosh", "cross_domain_websocket", "daemonize", |
43 "bosh_ports", |
44 "legacy_ssl_port", "legacy_ssl_ports", "legacy_ssl_interfaces", "legacy_ssl_ssl", |
44 "cross_domain_bosh", |
|
45 "cross_domain_websocket", |
|
46 "daemonize", |
|
47 "disallow_s2s", |
|
48 "legacy_ssl_interfaces", |
|
49 "legacy_ssl_port", |
|
50 "legacy_ssl_ports", |
|
51 "legacy_ssl_ssl", |
|
52 "no_daemonize", |
|
53 "require_encryption", |
|
54 "vcard_compatibility", |
45 }); |
55 }); |
46 local known_global_options = set.new({ |
56 local known_global_options = set.new({ |
47 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", |
57 "daemonize", |
48 "umask", "prosodyctl_timeout", "use_ipv6", "use_ipv4", "use_libevent", "network_settings", |
58 "gc", |
49 "network_backend", "http_default_host", |
59 "http_default_host", |
50 "statistics_interval", "statistics", "statistics_config", |
60 "installer_plugin_path", |
51 "plugin_server", "installer_plugin_path", "gc", "limits", |
61 "limits", |
|
62 "log", |
|
63 "network_backend", |
|
64 "network_settings", |
|
65 "pidfile", |
|
66 "plugin_paths", |
|
67 "plugin_server", |
|
68 "prosodyctl_timeout", |
|
69 "prosody_group", |
|
70 "prosody_user", |
|
71 "statistics", |
|
72 "statistics_config", |
|
73 "statistics_interval", |
|
74 "umask", |
|
75 "use_ipv4", |
|
76 "use_ipv6", |
|
77 "use_libevent", |
52 }); |
78 }); |
53 local config = configmanager.getconfig(); |
79 local config = configmanager.getconfig(); |
54 -- Check that we have any global options (caused by putting a host at the top) |
80 -- Check that we have any global options (caused by putting a host at the top) |
55 if it.count(it.filter("log", pairs(config["*"]))) == 0 then |
81 if it.count(it.filter("log", pairs(config["*"]))) == 0 then |
56 ok = false; |
82 ok = false; |