Mercurial > prosody-hg

comparison core/certmanager.lua @ 6520:c6caaa440e74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
certmanager: Return final ssl config along with ssl context on success
author Kim Alvefur <zash@zash.se>
date Wed, 19 Nov 2014 14:47:03 +0100
parents 71b6e8b48a12
children 873538f0b18c
comparison
equal deleted inserted replaced
6519:367db22cf7d2 6520:c6caaa440e74
135 end 135 end
136 log("error", "SSL/TLS: Failed to load '%s': %s (for %s)", file, reason, host); 136 log("error", "SSL/TLS: Failed to load '%s': %s (for %s)", file, reason, host);
137 else 137 else
138 log("error", "SSL/TLS: Error initialising for %s: %s", host, err); 138 log("error", "SSL/TLS: Error initialising for %s: %s", host, err);
139 end 139 end
140 else
141 err = nil;
140 end 142 end
141 return ctx, err; 143 return ctx, err or user_ssl_config;
142 end 144 end
143 145
144 function reload_ssl_config() 146 function reload_ssl_config()
145 global_ssl_config = configmanager.get("*", "ssl"); 147 global_ssl_config = configmanager.get("*", "ssl");
146 if luasec_has_no_compression then 148 if luasec_has_no_compression then