mod_storage_sql: Allow loops over results to end on their own

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 4ae1136c75c01cb1d631a96c0e30817f18eba6b9..a748345699ee5b9c408d6eb6402a8f2ad7930f65 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -590,8 +590,11 @@ function commands.about(arg)
                        module_versions[name] = module._VERSION;
                end
        end
+       if luaevent then
+               module_versions["libevent"] = luaevent.core.libevent_version();
+       end
        local sorted_keys = array.collect(keys(module_versions)):sort();
-       for _, name in ipairs(array.collect(keys(module_versions)):sort()) do
+       for _, name in ipairs(sorted_keys) do
                print(name..":"..string.rep(" ", longest_name-#name), module_versions[name]);
        end
        print("");
@@ -866,6 +869,7 @@ function commands.check(arg)
                print("Checking config...");
                local deprecated = set.new({
                        "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
+                       "vcard_compatibility",
                });
                local known_global_options = set.new({
                        "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
@@ -1077,7 +1081,7 @@ function commands.check(arg)
                                else
                                        if c2s_srv_required then
                                                print("    No _xmpp-client SRV record found for "..host..", but it looks like you need one.");
-                                               all_targst_ok = false;
+                                               all_targets_ok = false;
                                        else
                                                target_hosts:add(host);
                                        end
@@ -1223,7 +1227,7 @@ function commands.check(arg)
                                        print("  No 'certificate' found for "..host)
                                        cert_ok = false
                                elseif not ssl_config.key then
-                                       print("  No 'key' found for for "..host)
+                                       print("  No 'key' found for "..host)
                                        cert_ok = false
                                else
                                        local key, err = io.open(ssl_config.key); -- Permissions check only
@@ -1243,6 +1247,13 @@ function commands.check(arg)
                                                if not cert:validat(os.time()) then
                                                        print("    Certificate has expired.")
                                                        cert_ok = false
+                                               elseif not cert:validat(os.time() + 86400) then
+                                                       print("    Certificate expires within one day.")
+                                                       cert_ok = false
+                                               elseif not cert:validat(os.time() + 86400*7) then
+                                                       print("    Certificate expires within one week.")
+                                               elseif not cert:validat(os.time() + 86400*31) then
+                                                       print("    Certificate expires within one month.")
                                                end
                                                if config.get(host, "component_module") == nil
                                                        and not x509_verify_identity(host, "_xmpp-client", cert) then