Comparison

core/certmanager.lua @ 3372:395f692b3182

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Jul 2010 08:27:56 +0100
parent 3370:7c87af1c9a68
parent 3371:5b32e6f84392
child 3400:502a634f0578
comparison
equal deleted inserted replaced
3370:7c87af1c9a68 3372:395f692b3182
17 local resolve_path = prosody.resolve_relative_path; 17 local resolve_path = prosody.resolve_relative_path;
18 18
19 module "certmanager" 19 module "certmanager"
20 20
21 -- Global SSL options if not overridden per-host 21 -- Global SSL options if not overridden per-host
22 local default_ssl_config = configmanager.get("*", "core", "ssl") or {}; 22 local default_ssl_config = configmanager.get("*", "core", "ssl");
23 local default_capath = "/etc/ssl/certs"; 23 local default_capath = "/etc/ssl/certs";
24 24
25 function create_context(host, mode, config) 25 function create_context(host, mode, config)
26 local user_ssl_config = config and config.core.ssl or default_ssl_config; 26 local user_ssl_config = config and config.core.ssl or default_ssl_config;
27 27