Skip to content

Commit

Permalink
chore(conf): enable grpc_ssl_conf_command too (#12548)
Browse files Browse the repository at this point in the history
### Summary

The #12420 by @Water-Melon forgot to add `grpc_ssl_conf_command`.
This commit adds that.

Signed-off-by: Aapo Talvensaari <[email protected]>
  • Loading branch information
bungle authored Feb 16, 2024
1 parent 2fb898d commit 84cb1be
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions kong/conf_loader/parse.lua
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ local function check_and_parse(conf, opts)
"nginx_http_ssl_conf_command",
"nginx_http_proxy_ssl_conf_command",
"nginx_http_lua_ssl_conf_command",
"nginx_http_grpc_ssl_conf_command",
"nginx_stream_ssl_conf_command",
"nginx_stream_proxy_ssl_conf_command",
"nginx_stream_lua_ssl_conf_command"}) do
Expand Down
1 change: 1 addition & 0 deletions kong/templates/kong_defaults.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ nginx_http_ssl_session_timeout = NONE
nginx_http_ssl_conf_command = NONE
nginx_http_proxy_ssl_conf_command = NONE
nginx_http_lua_ssl_conf_command = NONE
nginx_http_grpc_ssl_conf_command = NONE
nginx_http_lua_regex_match_limit = 100000
nginx_http_lua_regex_cache_max_entries = 8192
nginx_http_keepalive_requests = 10000
Expand Down
1 change: 1 addition & 0 deletions kong/templates/nginx_kong.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ underscores_in_headers on;
lua_ssl_conf_command CipherString DEFAULT:@SECLEVEL=0;
proxy_ssl_conf_command CipherString DEFAULT:@SECLEVEL=0;
ssl_conf_command CipherString DEFAULT:@SECLEVEL=0;
grpc_ssl_conf_command CipherString DEFAULT:@SECLEVEL=0;
> end
> if ssl_ciphers then
ssl_ciphers ${{SSL_CIPHERS}};
Expand Down

0 comments on commit 84cb1be

Please sign in to comment.