prosody
2bb6586eacdd
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 6962:2bb6586eacdd

Merge...
author Kim Alvefur <zash@zash.se>
date Thu, 03 Dec 2015 16:46:24 +0100
parent 6960:50e2277ea05f
child 7065:4fc3c008976f
comparison
equal deleted inserted replaced
6956:82baf2609cbe 6962:2bb6586eacdd
911 print(" Suggestion: If "..host.. " is a new host with no real users yet, consider renaming it now to"); 911 print(" Suggestion: If "..host.. " is a new host with no real users yet, consider renaming it now to");
912 print(" "..host:gsub("^[^.]+%.", "")..". You can use SRV records to redirect XMPP clients and servers to "..host.."."); 912 print(" "..host:gsub("^[^.]+%.", "")..". You can use SRV records to redirect XMPP clients and servers to "..host..".");
913 print(" For more information see: http://prosody.im/doc/dns"); 913 print(" For more information see: http://prosody.im/doc/dns");
914 end 914 end
915 end 915 end
916 local all_options = set.new(); 916 local all_modules = set.new(config["*"].modules_enabled);
917 local all_options = set.new(it.to_array(it.keys(config["*"])));
917 for host in enabled_hosts() do 918 for host in enabled_hosts() do
918 all_options:include(set.new(it.to_array(it.keys(config[host])))); 919 all_options:include(set.new(it.to_array(it.keys(config[host]))));
919 end 920 all_modules:include(set.new(config[host].modules_enabled));
920 local ssl = nil, dependencies.softreq"ssl"; 921 end
922 for mod in all_modules do
923 if mod:match("^mod_") then
924 print("");
925 print(" Modules in modules_enabled should not have the 'mod_' prefix included.");
926 print(" Change '"..mod.."' to '"..mod:match("^mod_(.*)").."'.");
927 elseif mod:match("^auth_") then
928 print("");
929 print(" Authentication modules should not be added to modules_enabled,");
930 print(" but be specified in the 'authentication' option.");
931 print(" Remove '"..mod.."' from modules_enabled and instead add");
932 print(" authentication = '"..mod:match("^auth_(.*)").."'");
933 print(" For more information see https://prosody.im/doc/authentication");
934 elseif mod:match("^storage_") then
935 print("");
936 print(" storage modules should not be added to modules_enabled,");
937 print(" but be specified in the 'storage' option.");
938 print(" Remove '"..mod.."' from modules_enabled and instead add");
939 print(" storage = '"..mod:match("^storage_(.*)").."'");
940 print(" For more information see https://prosody.im/doc/storage");
941 end
942 end
943 local ssl = dependencies.softreq"ssl";
921 if not ssl then 944 if not ssl then
922 if not set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty() then 945 if not set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty() then
923 print(""); 946 print("");
924 print(" You require encryption but LuaSec is not available."); 947 print(" You require encryption but LuaSec is not available.");
925 print(" Connections will fail."); 948 print(" Connections will fail.");