diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-05 16:31:34 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-05 16:31:34 +0100 |
| commit | d2f663f5daae1b6d720d8ed0e9bf847dde07adb6 (patch) | |
| tree | 6815ba825d7158b632e3a9713842575d40d20e9a | |
| parent | ceb159bd90ebeeeb8d17ffde84c4ae799a5079e4 (diff) | |
| parent | e70cd52ed93921f41ed4d2fe1cf1f4457700554a (diff) | |
| download | prosody-d2f663f5daae1b6d720d8ed0e9bf847dde07adb6.tar.gz prosody-d2f663f5daae1b6d720d8ed0e9bf847dde07adb6.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/certmanager.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index b1ff648d..978a9efc 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -63,14 +63,13 @@ local function find_cert(user_certs, name) local key_path = certs .. key_try[i]:format(name); if stat(crt_path, "mode") == "file" then - if stat(key_path, "mode") == "file" then - return { certificate = crt_path, key = key_path }; - end if key_path:sub(-4) == ".crt" then key_path = key_path:sub(1, -4) .. "key"; if stat(key_path, "mode") == "file" then return { certificate = crt_path, key = key_path }; end + elseif stat(key_path, "mode") == "file" then + return { certificate = crt_path, key = key_path }; end end end @@ -120,7 +119,6 @@ end local function create_context(host, mode, ...) local cfg = new_config(); cfg:apply(core_defaults); - cfg:apply(global_ssl_config); local service_name, port = host:match("^(%w+) port (%d+)$"); if service_name then cfg:apply(find_service_cert(service_name, tonumber(port))); @@ -132,6 +130,7 @@ local function create_context(host, mode, ...) -- We can't read the password interactively when daemonized password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end; }); + cfg:apply(global_ssl_config); for i = select('#', ...), 1, -1 do cfg:apply(select(i, ...)); |