From aa3344731d2636073d39c3a2641d02813bd29019 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 20 Apr 2014 21:25:26 +0200 Subject: certmanager: Fix traceback if no global 'ssl' section set (thanks albert) --- core/certmanager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/certmanager.lua') diff --git a/core/certmanager.lua b/core/certmanager.lua index 8f1e1520..ced17e58 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -111,7 +111,9 @@ function create_context(host, mode, user_ssl_config) 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 -- cgit v1.2.3