diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-05 16:12:01 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-05 16:12:01 +0100 |
| commit | e70cd52ed93921f41ed4d2fe1cf1f4457700554a (patch) | |
| tree | 5d52975b26c0635571a880b55ece7248a90c6ca8 /core | |
| parent | c607c09f92ee1d490976dc69493a1bdc5db42752 (diff) | |
| download | prosody-e70cd52ed93921f41ed4d2fe1cf1f4457700554a.tar.gz prosody-e70cd52ed93921f41ed4d2fe1cf1f4457700554a.zip | |
certmanager: Try filename.key if certificate is set to a full filename ending with .crt
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index f6715998..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 |