diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-11-06 18:28:15 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-11-06 18:28:15 +0000 |
commit | c6045f3c70bf31cb54f66af60e10e5e788256b10 (patch) | |
tree | 2ccce526e76f0e3b873ec13133b3eaf9b5edee37 /core/certmanager.lua | |
parent | c5bcc70db662a51e4e704b034646bf194aed8b35 (diff) | |
download | prosody-c6045f3c70bf31cb54f66af60e10e5e788256b10.tar.gz prosody-c6045f3c70bf31cb54f66af60e10e5e788256b10.zip |
certmanager, hostmanager, mod_tls: Move responsibility for creating per-host SSL contexts to mod_tls, meaning reloading certs is now as trivial as reloading mod_tls
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 3f7bb348..79651242 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -23,8 +23,8 @@ module "certmanager" local default_ssl_config = configmanager.get("*", "core", "ssl"); local default_capath = "/etc/ssl/certs"; -function create_context(host, mode, config) - local user_ssl_config = config and config.core.ssl or default_ssl_config; +function create_context(host, mode, user_ssl_config) + user_ssl_config = user_ssl_config or default_ssl_config; if not ssl then return nil, "LuaSec (required for encryption) was not found"; end if not user_ssl_config then return nil, "No SSL/TLS configuration present for "..host; end |