core/certmanager.lua
changeset 12200 b05e0b422ff7
parent 12154 653a48b5a25b
child 12201 95d25e620dc2
equal deleted inserted replaced
12199:c5788969b812 12200:b05e0b422ff7
   348 	cfg:apply({
   348 	cfg:apply({
   349 		mode = mode,
   349 		mode = mode,
   350 		-- We can't read the password interactively when daemonized
   350 		-- We can't read the password interactively when daemonized
   351 		password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
   351 		password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
   352 	});
   352 	});
   353 	cfg:apply(global_ssl_config);
       
   354 	local preset = configmanager.get("*", "tls_preset") or "intermediate";
   353 	local preset = configmanager.get("*", "tls_preset") or "intermediate";
   355 	if preset ~= "legacy" then
   354 	if preset ~= "legacy" then
   356 		cfg:apply(mozilla_ssl_configs[preset]);
   355 		cfg:apply(mozilla_ssl_configs[preset]);
   357 	end
   356 	end
       
   357 	cfg:apply(global_ssl_config);
   358 
   358 
   359 	for i = select('#', ...), 1, -1 do
   359 	for i = select('#', ...), 1, -1 do
   360 		cfg:apply(select(i, ...));
   360 		cfg:apply(select(i, ...));
   361 	end
   361 	end
   362 	local user_ssl_config = cfg:final();
   362 	local user_ssl_config = cfg:final();