From 2ab1810f7d42d0aaae8e2307111fc1421d347978 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 10:05:35 +0100
Subject: moduleapi: Add API method for getting a file path

---
 core/moduleapi.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index c439ba6f..573f3153 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -301,6 +301,20 @@ function api:get_option_inherited_set(name, ...)
 	return value;
 end
 
+function api:get_option_path(name, default, parent)
+	if parent == nil then
+		parent = parent or self:get_directory();
+	elseif prosody.paths[parent] then
+		parent = prosody.paths[parent];
+	end
+	local value = self:get_option_string(name, default);
+	if value == nil then
+		return nil;
+	end
+	return resolve_relative_path(parent, value);
+end
+
+
 function api:context(host)
 	return setmetatable({host=host or "*"}, {__index=self,__newindex=self});
 end
-- 
cgit v1.2.3


From bccfb4fd28ade9f23ec5b67bb95906fb053417f0 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 10:06:09 +0100
Subject: mod_groups: Use module:get_option_path, look for file relative to
 config dir

---
 plugins/mod_groups.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index be1a5508..62a38246 100644
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -82,7 +82,7 @@ function remove_virtual_contacts(username, host, datastore, data)
 end
 
 function module.load()
-	groups_file = module:get_option_string("groups_file");
+	groups_file = module:get_option_path("groups_file", nil, "config");
 	if not groups_file then return; end
 
 	module:hook("roster-load", inject_roster_contacts);
-- 
cgit v1.2.3


From de6e734596d3abb660177b2cee47cf2ad5299d8e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 10:07:02 +0100
Subject: mod_groups: Move variable to smaller scope

---
 plugins/mod_groups.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index 62a38246..d696d453 100644
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -10,8 +10,6 @@
 local groups;
 local members;
 
-local groups_file;
-
 local jid, datamanager = require "util.jid", require "util.datamanager";
 local jid_prep = jid.prep;
 
@@ -82,7 +80,7 @@ function remove_virtual_contacts(username, host, datastore, data)
 end
 
 function module.load()
-	groups_file = module:get_option_path("groups_file", nil, "config");
+	local groups_file = module:get_option_path("groups_file", nil, "config");
 	if not groups_file then return; end
 
 	module:hook("roster-load", inject_roster_contacts);
-- 
cgit v1.2.3


From 5b245d20fe2502033248685276d72ce828cfe220 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 16:38:56 +0100
Subject: util.logger: Remove unused locals

---
 util/logger.lua | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/util/logger.lua b/util/logger.lua
index 3d1f1c8b..8010e8ad 100644
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -6,10 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
-local pcall = pcall;
-
-local find = string.find;
-local ipairs, pairs, setmetatable = ipairs, pairs, setmetatable;
+local pairs = pairs;
 
 local _ENV = nil;
 
-- 
cgit v1.2.3


From d7ef1df39b29dc02f7b0ca056b5f15c8fad4e273 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 16:40:32 +0100
Subject: util.logger: Silence luacheck warning

---
 util/logger.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/logger.lua b/util/logger.lua
index 8010e8ad..e72b29bc 100644
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -5,6 +5,7 @@
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
+-- luacheck: ignore 213/level
 
 local pairs = pairs;
 
-- 
cgit v1.2.3


From fc2a0d90fc4ba980aa5ca66bc2b3eef5d762df33 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 16:56:05 +0100
Subject: loggingmanager: Don't reset default timestamp that is not changed by
 any other code

---
 core/loggingmanager.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 259c2c44..8b68c26f 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -154,7 +154,6 @@ local function reload_logging()
 	default_file_logging = {
 		{ to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true }
 	};
-	default_timestamp = "%b %d %H:%M:%S";
 
 	logging_config = config.get("*", "log") or default_logging;
 
-- 
cgit v1.2.3


From fe4731209e0788a535f656cf90eb37d19881ac7f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 17:03:04 +0100
Subject: loggingmanager: Write out color code, log level and reset code in one
 call

---
 core/loggingmanager.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 8b68c26f..7d972bab 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -13,7 +13,7 @@ local setmetatable, rawset, pairs, ipairs, type =
 local io_open, io_write = io.open, io.write;
 local math_max, rep = math.max, string.rep;
 local os_date = os.date;
-local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle;
+local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
 
 -- COMPAT: This should no longer be needed since the addition of setvbuf calls
 if os.getenv("__FLUSH_LOG") then
@@ -235,9 +235,7 @@ do
 				io_write(os_date(timestamps), " ");
 			end
 			io_write(name, rep(" ", sourcewidth-namelen));
-			setstyle(logstyles[level]);
-			io_write(level);
-			setstyle();
+			io_write(getstring(logstyles[level], level));
 			if ... then
 				io_write("\t", format(message, ...), "\n");
 			else
-- 
cgit v1.2.3


From 68d6b5e89eca07ccb645d4bf16ed24218072563d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 17:33:16 +0100
Subject: loggingmanager: Refactor the console log sink to re-use the stdout
 sink which in turn uses the file sink (tailcalls!)

---
 core/loggingmanager.lua | 119 ++++++++++++++++++------------------------------
 1 file changed, 45 insertions(+), 74 deletions(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 7d972bab..c4cf4d3a 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -10,7 +10,8 @@
 local format = string.format;
 local setmetatable, rawset, pairs, ipairs, type =
 	setmetatable, rawset, pairs, ipairs, type;
-local io_open, io_write = io.open, io.write;
+local stdout = io.stdout;
+local io_open = io.open;
 local math_max, rep = math.max, string.rep;
 local os_date = os.date;
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
@@ -170,14 +171,18 @@ prosody.events.add_handler("config-reloaded", reload_logging);
 --- Definition of built-in logging sinks ---
 
 -- Null sink, must enter log_sink_types *first*
-function log_sink_types.nowhere()
+local function log_to_nowhere()
 	return function () return false; end;
 end
+log_sink_types.nowhere = log_to_nowhere;
 
--- Column width for "source" (used by stdout and console)
-local sourcewidth = 20;
+local function log_to_file(sink_config, logfile)
+	logfile = logfile or io_open(sink_config.filename, "a+");
+	if not logfile then
+		return log_to_nowhere(sink_config);
+	end
+	local write = logfile.write;
 
-function log_sink_types.stdout(sink_config)
 	local timestamps = sink_config.timestamps;
 
 	if timestamps == true then
@@ -185,97 +190,63 @@ function log_sink_types.stdout(sink_config)
 	end
 
 	if sink_config.buffer_mode ~= false then
-		io.stdout:setvbuf(sink_config.buffer_mode or "line");
+		logfile:setvbuf(sink_config.buffer_mode or "line");
 	end
 
 	return function (name, level, message, ...)
-		sourcewidth = math_max(#name+2, sourcewidth);
-		local namelen = #name;
 		if timestamps then
-			io_write(os_date(timestamps), " ");
+			write(logfile, os_date(timestamps), " ");
 		end
 		if ... then
-			io_write(name, rep(" ", sourcewidth-namelen), level, "\t", format(message, ...), "\n");
+			write(logfile, name, level, "\t", format(message, ...), "\n");
 		else
-			io_write(name, rep(" ", sourcewidth-namelen), level, "\t", message, "\n");
+			write(logfile, name, level, "\t", message, "\n");
 		end
 	end
 end
+log_sink_types.file = log_to_file;
 
-do
-	local do_pretty_printing = true;
+-- Column width for "source" (used by stdout and console)
+local sourcewidth = 20;
 
-	local logstyles = {};
-	if do_pretty_printing then
-		logstyles["info"] = getstyle("bold");
-		logstyles["warn"] = getstyle("bold", "yellow");
-		logstyles["error"] = getstyle("bold", "red");
+local function log_to_stdout(sink_config)
+	if not sink_config.timestamps then
+		sink_config.timestamps = false;
 	end
-	function log_sink_types.console(sink_config)
-		-- Really if we don't want pretty colours then just use plain stdout
-		if not do_pretty_printing then
-			return log_sink_types.stdout(sink_config);
-		end
-
-		local timestamps = sink_config.timestamps;
-
-		if timestamps == true then
-			timestamps = default_timestamp; -- Default format
-		end
-
-		if sink_config.buffer_mode ~= false then
-			io.stdout:setvbuf(sink_config.buffer_mode or "line");
-		end
-
-		return function (name, level, message, ...)
-			sourcewidth = math_max(#name+2, sourcewidth);
-			local namelen = #name;
-
-			if timestamps then
-				io_write(os_date(timestamps), " ");
-			end
-			io_write(name, rep(" ", sourcewidth-namelen));
-			io_write(getstring(logstyles[level], level));
-			if ... then
-				io_write("\t", format(message, ...), "\n");
-			else
-				io_write("\t", message, "\n");
-			end
-		end
+	local logtofile = log_to_file(sink_config, stdout);
+	return function (name, level, message, ...)
+		sourcewidth = math_max(#name+2, sourcewidth);
+		name = name ..  rep(" ", sourcewidth-#name);
+		return logtofile(name, level, message, ...);
 	end
 end
+log_sink_types.stdout = log_to_stdout;
 
-local empty_function = function () end;
-function log_sink_types.file(sink_config)
-	local log = sink_config.filename;
-	local logfile = io_open(log, "a+");
-	if not logfile then
-		return empty_function;
-	end
-
-	if sink_config.buffer_mode ~= false then
-		logfile:setvbuf(sink_config.buffer_mode or "line");
-	end
-
-	local write = logfile.write;
+local do_pretty_printing = true;
 
-	local timestamps = sink_config.timestamps;
+local logstyles;
+if do_pretty_printing then
+	logstyles = {};
+	logstyles["info"] = getstyle("bold");
+	logstyles["warn"] = getstyle("bold", "yellow");
+	logstyles["error"] = getstyle("bold", "red");
+end
 
-	if timestamps == nil or timestamps == true then
-		timestamps = default_timestamp; -- Default format
+local function log_to_console(sink_config)
+	-- Really if we don't want pretty colours then just use plain stdout
+	local logstdout = log_to_stdout(sink_config);
+	if not do_pretty_printing then
+		return logstdout;
 	end
-
 	return function (name, level, message, ...)
-		if timestamps then
-			write(logfile, os_date(timestamps), " ");
+		local logstyle = logstyles[level];
+		if logstyle then
+			level = getstring(logstyle, level);
 		end
-		if ... then
-			write(logfile, name, "\t", level, "\t", format(message, ...), "\n");
-		else
-			write(logfile, name, "\t" , level, "\t", message, "\n");
-		end
-	end;
+		return logstdout(name, level, message, ...);
+	end
 end
+log_sink_types.console = log_to_console;
 
 local function register_sink_type(name, sink_maker)
 	local old_sink_maker = log_sink_types[name];
-- 
cgit v1.2.3


From c32e03898c2b4cfe16ca932cefc0b532e5c36463 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 17:49:09 +0100
Subject: loggingmanager: Move logic for adaptive column width into file sink,
 append tab if disabled (fixes separation between name and level in plain file
 sinks)

---
 core/loggingmanager.lua | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index c4cf4d3a..ee1aa362 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -193,10 +193,19 @@ local function log_to_file(sink_config, logfile)
 		logfile:setvbuf(sink_config.buffer_mode or "line");
 	end
 
+	-- Column width for "source" (used by stdout and console)
+	local sourcewidth = sink_config.source_width;
+
 	return function (name, level, message, ...)
 		if timestamps then
 			write(logfile, os_date(timestamps), " ");
 		end
+		if sourcewidth then
+			sourcewidth = math_max(#name+2, sourcewidth);
+			name = name ..  rep(" ", sourcewidth-#name);
+		else
+			name = name .. "\t";
+		end
 		if ... then
 			write(logfile, name, level, "\t", format(message, ...), "\n");
 		else
@@ -206,19 +215,12 @@ local function log_to_file(sink_config, logfile)
 end
 log_sink_types.file = log_to_file;
 
--- Column width for "source" (used by stdout and console)
-local sourcewidth = 20;
-
 local function log_to_stdout(sink_config)
 	if not sink_config.timestamps then
 		sink_config.timestamps = false;
 	end
-	local logtofile = log_to_file(sink_config, stdout);
-	return function (name, level, message, ...)
-		sourcewidth = math_max(#name+2, sourcewidth);
-		name = name ..  rep(" ", sourcewidth-#name);
-		return logtofile(name, level, message, ...);
-	end
+	sink_config.source_width = 20;
+	return log_to_file(sink_config, stdout);
 end
 log_sink_types.stdout = log_to_stdout;
 
-- 
cgit v1.2.3


From c9f2829f6e58e2fbc06ad23c69cb51ac25aa7e80 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 17:51:39 +0100
Subject: loggingmanager: Make initial value for width of log name configurable

---
 core/loggingmanager.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index ee1aa362..b47c2ea5 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -219,7 +219,9 @@ local function log_to_stdout(sink_config)
 	if not sink_config.timestamps then
 		sink_config.timestamps = false;
 	end
-	sink_config.source_width = 20;
+	if sink_config.source_width == nil then
+		sink_config.source_width = 20;
+	end
 	return log_to_file(sink_config, stdout);
 end
 log_sink_types.stdout = log_to_stdout;
-- 
cgit v1.2.3


From 883547a4db409190f32d2a1c3b843a0b4d0bbb96 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 17:57:12 +0100
Subject: loggingmanager: Write out timestamps in same write() call as
 everything else

---
 core/loggingmanager.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index b47c2ea5..00398229 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -35,7 +35,7 @@ local _ENV = nil;
 -- The log config used if none specified in the config file (see reload_logging for initialization)
 local default_logging;
 local default_file_logging;
-local default_timestamp = "%b %d %H:%M:%S";
+local default_timestamp = "%b %d %H:%M:%S ";
 -- The actual config loggingmanager is using
 local logging_config;
 
@@ -187,6 +187,8 @@ local function log_to_file(sink_config, logfile)
 
 	if timestamps == true then
 		timestamps = default_timestamp; -- Default format
+	elseif timestamps then
+		timestamps = timestamps .. " ";
 	end
 
 	if sink_config.buffer_mode ~= false then
@@ -197,9 +199,6 @@ local function log_to_file(sink_config, logfile)
 	local sourcewidth = sink_config.source_width;
 
 	return function (name, level, message, ...)
-		if timestamps then
-			write(logfile, os_date(timestamps), " ");
-		end
 		if sourcewidth then
 			sourcewidth = math_max(#name+2, sourcewidth);
 			name = name ..  rep(" ", sourcewidth-#name);
@@ -207,9 +206,9 @@ local function log_to_file(sink_config, logfile)
 			name = name .. "\t";
 		end
 		if ... then
-			write(logfile, name, level, "\t", format(message, ...), "\n");
+			write(logfile, timestamps and os_date(timestamps) or "", name, level, "\t", format(message, ...), "\n");
 		else
-			write(logfile, name, level, "\t", message, "\n");
+			write(logfile, timestamps and os_date(timestamps) or "", name, level, "\t", message, "\n");
 		end
 	end
 end
-- 
cgit v1.2.3


From 47f497ad9364b3f6af3e66b771fdc7cb9ed17f7b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 18:40:24 +0100
Subject: loggingmanager: Remove Windows hack, buffer_mode should fix this

---
 core/loggingmanager.lua | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 00398229..64e1ea77 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -16,13 +16,6 @@ local math_max, rep = math.max, string.rep;
 local os_date = os.date;
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
 
--- COMPAT: This should no longer be needed since the addition of setvbuf calls
-if os.getenv("__FLUSH_LOG") then
-	local io_flush = io.flush;
-	local _io_write = io_write;
-	io_write = function(...) _io_write(...); io_flush(); end
-end
-
 local config = require "core.configmanager";
 local logger = require "util.logger";
 local prosody = prosody;
-- 
cgit v1.2.3


From 1ca9c3d5200f76d6aa0bc8ab47d288b4b5fe6179 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 4 Feb 2016 20:45:37 +0100
Subject: loggingmanager: Stringify all arguments to format so we can finally
 see the *real* error messages

---
 core/loggingmanager.lua | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 64e1ea77..77d31964 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -15,6 +15,8 @@ local io_open = io.open;
 local math_max, rep = math.max, string.rep;
 local os_date = os.date;
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
+local tostring = tostring;
+local unpack = table.unpack or unpack;
 
 local config = require "core.configmanager";
 local logger = require "util.logger";
@@ -192,17 +194,22 @@ local function log_to_file(sink_config, logfile)
 	local sourcewidth = sink_config.source_width;
 
 	return function (name, level, message, ...)
+		local n = select('#', ...);
+		if n ~= 0 then
+			local arg = { ... };
+			for i = 1, n do
+				arg[i] = tostring(arg[i]);
+			end
+			message = format(message, unpack(arg, 1, n));
+		end
+
 		if sourcewidth then
 			sourcewidth = math_max(#name+2, sourcewidth);
 			name = name ..  rep(" ", sourcewidth-#name);
 		else
 			name = name .. "\t";
 		end
-		if ... then
-			write(logfile, timestamps and os_date(timestamps) or "", name, level, "\t", format(message, ...), "\n");
-		else
-			write(logfile, timestamps and os_date(timestamps) or "", name, level, "\t", message, "\n");
-		end
+		write(logfile, timestamps and os_date(timestamps) or "", name, level, "\t", message, "\n");
 	end
 end
 log_sink_types.file = log_to_file;
-- 
cgit v1.2.3


From e2b370c6bf9d1495d9d180fb8713d3a5d774e0fd Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 5 Feb 2016 00:03:41 +0000
Subject: certmanager: Support new certificate configuration for non-XMPP
 services too (fixes #614)

---
 core/certmanager.lua | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/core/certmanager.lua b/core/certmanager.lua
index db3cf58e..b1ff648d 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -56,12 +56,11 @@ local global_certificates = configmanager.get("*", "certificates") or "certs";
 local crt_try = { "", "/%s.crt", "/%s/fullchain.pem", "/%s.pem", };
 local key_try = { "", "/%s.key", "/%s/privkey.pem",   "/%s.pem", };
 
-local function find_cert(host)
-	local certs = configmanager.get(host, "certificate") or global_certificates;
-	certs = resolve_path(config_path, certs);
+local function find_cert(user_certs, name)
+	local certs = resolve_path(config_path, user_certs or global_certificates);
 	for i = 1, #crt_try do
-		local crt_path = certs .. crt_try[i]:format(host);
-		local key_path = certs .. key_try[i]:format(host);
+		local crt_path = certs .. crt_try[i]:format(name);
+		local key_path = certs .. key_try[i]:format(name);
 
 		if stat(crt_path, "mode") == "file" then
 			if stat(key_path, "mode") == "file" then
@@ -77,6 +76,19 @@ local function find_cert(host)
 	end
 end
 
+local function find_host_cert(host)
+	if not host then return nil; end
+	return find_cert(configmanager.get(host, "certificate"), host) or find_host_cert(host:match("%.(.+)$"));
+end
+
+local function find_service_cert(service, port)
+	local cert_config = configmanager.get("*", service.."_certificate");
+	if type(cert_config) == "table" then
+		cert_config = cert_config[port] or cert_config.default;
+	end
+	return find_cert(cert_config, service);
+end
+
 -- Built-in defaults
 local core_defaults = {
 	capath = "/etc/ssl/certs";
@@ -109,7 +121,12 @@ local function create_context(host, mode, ...)
 	local cfg = new_config();
 	cfg:apply(core_defaults);
 	cfg:apply(global_ssl_config);
-	cfg:apply(find_cert(host) or find_cert(host:match("%.(.*)")));
+	local service_name, port = host:match("^(%w+) port (%d+)$");
+	if service_name then
+		cfg:apply(find_service_cert(service_name, tonumber(port)));
+	else
+		cfg:apply(find_host_cert(host));
+	end
 	cfg:apply({
 		mode = mode,
 		-- We can't read the password interactively when daemonized
-- 
cgit v1.2.3