portmanager: Lower the priority of module-supplied TLS options
authorKim Alvefur <zash@zash.se>
Tue, 8 Dec 2015 19:12:38 +0000 (20:12 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 8 Dec 2015 19:12:38 +0000 (20:12 +0100)
core/portmanager.lua

index 9f95077a483ca76f157ffe8abd29bfe7c24a2186..ad1a0be397edd976f45852e5744f2aa354cce5e1 100644 (file)
@@ -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