From f629de74c48447ea8850a8d104fede5c7e1b5068 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 14 Apr 2011 22:40:50 +0100 Subject: prosody: Add sanity_check() to startup sequence. Check that we have at least one vhost enabled to avoid Bad Things. --- prosody | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/prosody b/prosody index 86e82490..1a58fd33 100755 --- 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 @@ -463,6 +476,7 @@ end -- previous steps to have already been performed read_config(); init_logging(); +sanity_check(); sandbox_require(); set_function_metatable(); load_libraries(); -- cgit v1.2.3 From 0f81719d6086ee57e06002eadfd98d8b869e41ae Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 15 Apr 2011 22:39:53 +0100 Subject: util.datetime: Fix timestamp parsing when in DST (thanks xnyhps) --- util/datetime.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/datetime.lua b/util/datetime.lua index 301a49a5..c73d8e76 100644 --- a/util/datetime.lua +++ b/util/datetime.lua @@ -49,7 +49,7 @@ function parse(s) if sign == "-" then tzd_offset = -tzd_offset; end end sec = (sec + time_offset) - tzd_offset; - return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec}); + return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec, isdst=false}); end end end -- cgit v1.2.3