[apisix] branch master updated: fix: move lua_ssl_trusted_certificate to work with background timer (#4443)

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new c22d3db  fix: move lua_ssl_trusted_certificate to work with background timer (#4443)
c22d3db is described below

commit c22d3db00a75a4cf665919128fb31889369467bc
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Fri Jun 18 18:12:45 2021 +0800

    fix: move lua_ssl_trusted_certificate to work with background timer (#4443)
---
 apisix/cli/ngx_tpl.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
index 42dfaeb..3e44b53 100644
--- a/apisix/cli/ngx_tpl.lua
+++ b/apisix/cli/ngx_tpl.lua
@@ -260,6 +260,10 @@ http {
     {% end %}
     {% end %}
 
+    {% if ssl.ssl_trusted_certificate ~= nil then %}
+    lua_ssl_trusted_certificate {* ssl.ssl_trusted_certificate *};
+    {% end %}
+
     # http configuration snippet starts
     {% if http_configuration_snippet then %}
     {* http_configuration_snippet *}
@@ -440,10 +444,6 @@ http {
 
         server_name _;
 
-        {% if ssl.ssl_trusted_certificate ~= nil then %}
-        lua_ssl_trusted_certificate {* ssl.ssl_trusted_certificate *};
-        {% end %}
-
         {% if ssl.enable then %}
         ssl_certificate      {* ssl.ssl_cert *};
         ssl_certificate_key  {* ssl.ssl_cert_key *};