aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-01 21:03:17 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-01 21:03:17 +0000
commit651f61921bc5a867fdba3337ae7541fa4feccf7d (patch)
tree267bb4e32e4655ad6bac8cbda16e04ebebc48859 /core
parent2f5a9cd4ede54690f4fd1633ab201add613a5645 (diff)
parent29e84d0af11fad1c6091340978065b7586193228 (diff)
downloadprosody-651f61921bc5a867fdba3337ae7541fa4feccf7d.tar.gz
prosody-651f61921bc5a867fdba3337ae7541fa4feccf7d.zip
Merge with 0.7
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 5794ba6e..c2db63fe 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -54,7 +54,7 @@ function create_context(host, mode, config)
end
function reload_ssl_config()
- default_ssl_config = config.get("*", "core", "ssl");
+ default_ssl_config = configmanager.get("*", "core", "ssl");
end
prosody.events.add_handler("config-reloaded", reload_ssl_config);