util.cache: Add support for creating a proxy table to a cache, that looks and acts...

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index f58c3abc9c10ff12f9d0bff3d3a154e173598d83..c8366faf9ae68193ccc98767f8ea68fd62a4f047 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -11,10 +11,10 @@
 
 -- Will be modified by configure script if run --
 
-CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
-CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
-CFG_DATADIR=os.getenv("PROSODY_DATADIR");
+CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
+CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
+CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
+CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
@@ -594,7 +594,7 @@ function commands.about(arg)
                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("");
@@ -869,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",
@@ -1062,11 +1063,15 @@ function commands.check(arg)
                
                local v6_supported = not not socket.tcp6;
                
-               for host, host_options in enabled_hosts() do
+               for jid, host_options in enabled_hosts() do
                        local all_targets_ok, some_targets_ok = true, false;
+                       local node, host = jid_split(jid);
                        
                        local is_component = not not host_options.component_module;
-                       print("Checking DNS for "..(is_component and "component" or "host").." "..host.."...");
+                       print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
+                       if node then
+                               print("Only the domain part ("..host..") is used in DNS.")
+                       end
                        local target_hosts = set.new();
                        if not is_component then
                                local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");
@@ -1080,7 +1085,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