diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
| commit | 2bde8103f5dba708e6e7a9b0773eba493bfefa7c (patch) | |
| tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/certmanager.lua | |
| parent | bcd8f33f5be7555e0c7863b76e950bd9d156afe0 (diff) | |
| parent | aa0eb8fdc87589433a1cd5d03f136fb6f32a7426 (diff) | |
| download | prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.tar.gz prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 8607e618..b91f7110 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -27,7 +27,7 @@ end module "certmanager" -- Global SSL options if not overridden per-host -local default_ssl_config = configmanager.get("*", "core", "ssl"); +local default_ssl_config = configmanager.get("*", "ssl"); local default_capath = "/etc/ssl/certs"; local default_verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none"; local default_options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil }; @@ -100,7 +100,7 @@ function create_context(host, mode, user_ssl_config) end function reload_ssl_config() - default_ssl_config = configmanager.get("*", "core", "ssl"); + default_ssl_config = configmanager.get("*", "ssl"); end prosody.events.add_handler("config-reloaded", reload_ssl_config); |