util.dataforms: Fix verfication for booleans

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 0aba4bb68097370c1c18a4491e613d081acb2703..e18b4e61c94b57bdac591e6c8590109d2eac0918 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -127,6 +127,19 @@ function log_dependency_warnings()
        dependencies.log_warnings();
 end
 
+function sanity_check()
+       for host, host_config in pairs(configmanager.getconfig()) do
+               if host ~= "*"
+               and host_config.core.enabled ~= false
+               and not host_config.core.component_module then
+                       return;
+               end
+       end
+       log("error", "No enabled VirtualHost entries found in the config file.");
+       log("error", "At least one active host is required for Prosody to function. Exiting...");
+       os.exit(1);
+end
+
 function sandbox_require()
        -- Replace require() with one that doesn't pollute _G, required
        -- for neat sandboxing of modules
@@ -190,7 +203,7 @@ function init_global_state()
                -- path1;path2;path3;defaultpath...
                CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
        end
-       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
+       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR or ".", 
                          plugins = CFG_PLUGINDIR or "plugins", data = data_path };
 
        prosody.arg = _G.arg;
@@ -257,7 +270,7 @@ function init_global_state()
                                if type(port) ~= "number" then
                                        log("error", "Non-numeric "..ports_option..": "..tostring(port));
                                else
-                                       local ok, err = cl.start(listener, {
+                                       local ok, errors = cl.start(listener, {
                                                ssl = conntype == "ssl" and global_ssl_ctx,
                                                port = port,
                                                interface = (option and config.get("*", "core", option.."_interface"))
@@ -266,31 +279,33 @@ function init_global_state()
                                                type = conntype
                                        });
                                        if not ok then
-                                               local friendly_message = err;
-                                               if err:match(" in use") then
-                                                       if port == 5222 or port == 5223 or port == 5269 then
-                                                               friendly_message = "check that Prosody or another XMPP server is "
-                                                                       .."not already running and using this port";
-                                                       elseif port == 80 or port == 81 then
-                                                               friendly_message = "check that a HTTP server is not already using "
-                                                                       .."this port";
-                                                       elseif port == 5280 then
-                                                               friendly_message = "check that Prosody or a BOSH connection manager "
-                                                                       .."is not already running";
-                                                       else
-                                                               friendly_message = "this port is in use by another application";
-                                                       end
-                                               elseif err:match("permission") then
-                                                       friendly_message = "Prosody does not have sufficient privileges to use this port";
-                                               elseif err == "no ssl context" then
-                                                       if not config.get("*", "core", "ssl") then
-                                                               friendly_message = "there is no 'ssl' config under Host \"*\" which is "
-                                                                       .."require for legacy SSL ports";
-                                                       else
-                                                               friendly_message = "initializing SSL support failed, see previous log entries";
+                                               for addr, err in pairs(errors) do
+                                                       local friendly_message = err;
+                                                       if err:match(" in use") then
+                                                               if port == 5222 or port == 5223 or port == 5269 then
+                                                                       friendly_message = "check that Prosody or another XMPP server is "
+                                                                               .."not already running and using this port";
+                                                               elseif port == 80 or port == 81 then
+                                                                       friendly_message = "check that a HTTP server is not already using "
+                                                                               .."this port";
+                                                               elseif port == 5280 then
+                                                                       friendly_message = "check that Prosody or a BOSH connection manager "
+                                                                               .."is not already running";
+                                                               else
+                                                                       friendly_message = "this port is in use by another application";
+                                                               end
+                                                       elseif err:match("permission") then
+                                                               friendly_message = "Prosody does not have sufficient privileges to use this port";
+                                                       elseif err == "no ssl context" then
+                                                               if not config.get("*", "core", "ssl") then
+                                                                       friendly_message = "there is no 'ssl' config under Host \"*\" which is "
+                                                                               .."require for legacy SSL ports";
+                                                               else
+                                                                       friendly_message = "initializing SSL support failed, see previous log entries";
+                                                               end
                                                        end
+                                                       log("error", "Failed to open server port %d on %s, %s", port, addr, friendly_message);
                                                end
-                                               log("error", "Failed to open server port %d, %s", port, friendly_message);
                                        end
                                end
                        end
@@ -323,7 +338,7 @@ function load_secondary_libraries()
        require "core.sessionmanager"
        require "core.stanza_router"
        package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
-               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[\s\t]*([^\n]*)"));
+               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));
                return function() end
        end});
 
@@ -345,6 +360,7 @@ function load_secondary_libraries()
        ]]
 
        require "net.connlisteners";
+       require "net.httpserver";
        
        require "util.stanza"
        require "util.jid"
@@ -462,6 +478,7 @@ end
 -- previous steps to have already been performed
 read_config();
 init_logging();
+sanity_check();
 sandbox_require();
 set_function_metatable();
 load_libraries();