author | Kim Alvefur <zash@zash.se> |
Sun, 20 Apr 2014 21:25:26 +0200 | |
changeset 6087 | 821756a862b0 |
parent 6086 | 3b4fde51fa25 |
child 6088 | be10c6c5aa7f |
child 6089 | d774cb85664b |
--- a/core/certmanager.lua Sat Apr 19 21:59:53 2014 +0200 +++ b/core/certmanager.lua Sun Apr 20 21:25:26 2014 +0200 @@ -111,7 +111,9 @@ for option in pairs(set_options) do local merged = {}; merge_set(core_defaults[option], merged); - merge_set(global_ssl_config[option], merged); + if global_ssl_config then + merge_set(global_ssl_config[option], merged); + end merge_set(user_ssl_config[option], merged); local final_array = {}; for opt, enable in pairs(merged) do