From 1f725600a69c6b1e7ed572bf587d1103f1711086 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 8 Dec 2015 20:12:38 +0100 Subject: portmanager: Lower the priority of module-supplied TLS options --- core/portmanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/portmanager.lua') diff --git a/core/portmanager.lua b/core/portmanager.lua index 9f95077a..ad1a0be3 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -111,10 +111,10 @@ local function activate(service_name) local global_ssl_config = config.get("*", "ssl") or {}; local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config; ssl, err = certmanager.create_context(service_info.name.." port "..port, "server", - service_info.ssl_config or {}, prefix_ssl_config[interface], prefix_ssl_config[port], prefix_ssl_config, + service_info.ssl_config or {}, global_ssl_config[interface], global_ssl_config[port]); if not ssl then -- cgit v1.2.3