Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.{prosodyctl,openssl}: More use of config sections removed
authorKim Alvefur <zash@zash.se>
Sat, 23 Mar 2013 02:38:30 +0100
changeset 5379 27de7cc94111
parent 5378 ec3accda44d3
child 5380 e119e378b1d9
util.{prosodyctl,openssl}: More use of config sections removed
util/openssl.lua file | annotate | diff | comparison | revisions
util/prosodyctl.lua file | annotate | diff | comparison | revisions 
--- a/util/openssl.lua	Sat Mar 23 02:35:50 2013 +0100
+++ b/util/openssl.lua	Sat Mar 23 02:38:30 2013 +0100
@@ -100,13 +100,13 @@
 			if name == certhost or name:sub(-1-#certhost) == "."..certhost then
 				found_matching_hosts = true;
 				self:add_dNSName(name);
-				--print(name .. "#component_module: " .. (config.get(name, "core", "component_module") or "nil"));
-				if config.get(name, "core", "component_module") == nil then
+				--print(name .. "#component_module: " .. (config.get(name, "component_module") or "nil"));
+				if config.get(name, "component_module") == nil then
 					self:add_sRVName(name, "xmpp-client");
 				end
-				--print(name .. "#anonymous_login: " .. tostring(config.get(name, "core", "anonymous_login")));
-				if not (config.get(name, "core", "anonymous_login") or
-						config.get(name, "core", "authentication") == "anonymous") then
+				--print(name .. "#anonymous_login: " .. tostring(config.get(name, "anonymous_login")));
+				if not (config.get(name, "anonymous_login") or
+						config.get(name, "authentication") == "anonymous") then
 					self:add_sRVName(name, "xmpp-server");
 				end
 				self:add_xmppAddr(name);
--- a/util/prosodyctl.lua	Sat Mar 23 02:35:50 2013 +0100
+++ b/util/prosodyctl.lua	Sat Mar 23 02:38:30 2013 +0100
@@ -182,12 +182,12 @@
 end
 
 function getpid()
-	local pidfile = config.get("*", "core", "pidfile");
+	local pidfile = config.get("*", "pidfile");
 	if not pidfile then
 		return false, "no-pidfile";
 	end
 	
-	local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
+	local modules_enabled = set.new(config.get("*", "modules_enabled"));
 	if not modules_enabled:contains("posix") then
 		return false, "no-posix";
 	end
prosody