aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-12-08 20:12:38 +0100
committerKim Alvefur <zash@zash.se>2015-12-08 20:12:38 +0100
commit2458f50dcae3f60055a9f79e8a9c91dd1b28fc46 (patch)
tree7bc04c79c5d880c5e5a578b971a60730dc9da94f /core
parent1ef7f18752399e71f6cfd58fa95769fb6600d45b (diff)
downloadprosody-2458f50dcae3f60055a9f79e8a9c91dd1b28fc46.tar.gz
prosody-2458f50dcae3f60055a9f79e8a9c91dd1b28fc46.zip
portmanager: Lower the priority of module-supplied TLS options
Diffstat (limited to 'core')
-rw-r--r--core/portmanager.lua2
1 files changed, 1 insertions, 1 deletions
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