prosodyctl
changeset 8070 91550b6f93d2
parent 8015 e898c8fda986
child 8071 5abb6bc45edd
child 8097 dcda2ae4569d
equal deleted inserted replaced
8069:5eec340c75fb 8070:91550b6f93d2
   969 				print("    storage modules should not be added to modules_enabled,");
   969 				print("    storage modules should not be added to modules_enabled,");
   970 				print("    but be specified in the 'storage' option.");
   970 				print("    but be specified in the 'storage' option.");
   971 				print("    Remove '"..mod.."' from modules_enabled and instead add");
   971 				print("    Remove '"..mod.."' from modules_enabled and instead add");
   972 				print("        storage = '"..mod:match("^storage_(.*)").."'");
   972 				print("        storage = '"..mod:match("^storage_(.*)").."'");
   973 				print("    For more information see https://prosody.im/doc/storage");
   973 				print("    For more information see https://prosody.im/doc/storage");
       
   974 			end
       
   975 		end
       
   976 		for host, config in pairs(config) do
       
   977 			if type(rawget(config, "storage")) == "string" and rawget(config, "default_storage") then
       
   978 				print("");
       
   979 				print("    The 'default_storage' option is not needed if 'storage' is set to a string.");
       
   980 				break;
   974 			end
   981 			end
   975 		end
   982 		end
   976 		local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
   983 		local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
   977 		local ssl = dependencies.softreq"ssl";
   984 		local ssl = dependencies.softreq"ssl";
   978 		if not ssl then
   985 		if not ssl then