Software / code / prosody
Changeset
6294:0033b021038f
core.certmanager: Make create_context() support an arbitrary number of option sets, merging all
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 03 Jul 2014 15:32:26 +0200 |
| parents | 6293:851fb5e9fa0c |
| children | 6295:cb12ff49503d |
| files | core/certmanager.lua |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Thu Jul 03 15:31:12 2014 +0200 +++ b/core/certmanager.lua Thu Jul 03 15:32:26 2014 +0200 @@ -16,6 +16,7 @@ local pairs = pairs; local type = type; local io_open = io.open; +local select = select; local prosody = prosody; local resolve_path = require"util.paths".resolve_relative_path; @@ -62,7 +63,7 @@ end end -function create_context(host, mode, user_ssl_config) +function create_context(host, mode, ...) if not ssl then return nil, "LuaSec (required for encryption) was not found"; end local cfg = new_config(); @@ -73,9 +74,11 @@ -- We can't read the password interactively when daemonized password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end; }); - cfg:apply(user_ssl_config); - user_ssl_config = cfg:final(); + for i = select('#', ...), 1, -1 do + cfg:apply(select(i, ...)); + end + local user_ssl_config = cfg:final(); if mode == "server" then if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
