diff options
| author | Kim Alvefur <zash@zash.se> | 2016-07-29 12:34:16 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-07-29 12:34:16 +0200 |
| commit | bf39a5e45f3a3f988aadea1dc968f66a23721767 (patch) | |
| tree | 54310cc96bc9904a03ed6cfea934245f4d347058 /core | |
| parent | 49d78800587641b15e66962f2740d501c1169a08 (diff) | |
| parent | c4d9a997e5ad67ec188eec5ace8e8e8ebd31f58d (diff) | |
| download | prosody-bf39a5e45f3a3f988aadea1dc968f66a23721767.tar.gz prosody-bf39a5e45f3a3f988aadea1dc968f66a23721767.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 29a5a6c8..c286a901 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -33,7 +33,7 @@ local select = select; 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); |