Software / code / prosody
Changeset
7532:02b3ea42265b
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 29 Jul 2016 12:34:16 +0200 |
| parents | 7530:f14094d10925 (current diff) 7531:2db68d1a6eeb (diff) |
| children | 7534:ba782a093b14 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Thu Jul 28 09:39:50 2016 +0100 +++ b/core/certmanager.lua Fri Jul 29 12:34:16 2016 +0200 @@ -33,7 +33,7 @@ local prosody = prosody; local resolve_path = require"util.paths".resolve_relative_path; -local config_path = prosody.paths.config; +local config_path = prosody.paths.config or "."; local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)"); local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor);
