prosody
3094166cfdd5
core/hostmanager.lua

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

Software / code / prosody

Diff

core/hostmanager.lua @ 2984:3094166cfdd5

Merge 0.6 into 0.7.
author Waqas Hussain <waqas20@gmail.com>
date Sat, 01 May 2010 05:18:38 +0500
parent 2925:692b3c6c5bd2
parent 2981:15a7afea7f59
child 3434:428f13c098d5
line wrap: on
line diff
--- a/core/hostmanager.lua	Mon Apr 19 18:30:59 2010 +0500
+++ b/core/hostmanager.lua	Sat May 01 05:18:38 2010 +0500
@@ -42,7 +42,7 @@
 	end
 	
 	if not activated_any_host then
-		log("error", "No hosts defined in the config file. This may cause unexpected behaviour as no modules will be loaded.");
+		log("error", "No active VirtualHost entries in the config file. This may cause unexpected behaviour as no modules will be loaded.");
 	end
 	
 	eventmanager.fire_event("hosts-activated", defined_hosts);
@@ -60,8 +60,8 @@
 			dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
 	              };
 	for option_name in pairs(host_config.core) do
-		if option_name:match("_ports$") then
-			log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in global Host \"*\" instead", host, option_name);
+		if option_name:match("_ports$") or option_name:match("_interface$") then
+			log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);
 		end
 	end