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 | 83b016fe3d1298c6bd9994cd6e61833522459b26 (patch) | |
| tree | 54310cc96bc9904a03ed6cfea934245f4d347058 | |
| parent | d6780dd7edf90f052074613505fd5917e76b72e6 (diff) | |
| parent | 0e989e1401461849ad45949f61a6e9413dd2f160 (diff) | |
| download | prosody-83b016fe3d1298c6bd9994cd6e61833522459b26.tar.gz prosody-83b016fe3d1298c6bd9994cd6e61833522459b26.zip | |
Merge 0.10->trunk
| -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); |