aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-05-09 23:35:54 +0200
committerKim Alvefur <zash@zash.se>2014-05-09 23:35:54 +0200
commit58b46e2d6c3230cbef1bf62f90da3a9d329c1dea (patch)
treeb18cb027c5578a9efd74e0e4bea0b0d4401abdec /core/certmanager.lua
parent4085591233dccaa78abdbf8a43007f08c8426d5e (diff)
parent3cfe230bd0725c3c3cc3aacb97f11edf12da8305 (diff)
downloadprosody-58b46e2d6c3230cbef1bf62f90da3a9d329c1dea.tar.gz
prosody-58b46e2d6c3230cbef1bf62f90da3a9d329c1dea.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 74da771e..d6a59b9f 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -19,7 +19,7 @@ local t_concat = table.concat;
local t_insert = table.insert;
local prosody = prosody;
-local resolve_path = configmanager.resolve_relative_path;
+local resolve_path = require"util.paths".resolve_relative_path;
local config_path = prosody.paths.config;
local luasec_has_noticket, luasec_has_verifyext, luasec_has_no_compression;