DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change SSLConfCommand to SSLConfCommands

Browse source
This commit is contained in:
Andrei Zhozhin 2023-01-30 13:54:57 +00:00
parent fecbdcc7e8
commit 3c5ae4cf06
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ingress/controller/config/config.go
View file

@ -339,7 +339,7 @@ type Configuration struct {
// Allows configuration of arbitrary OpenSSL configuration // Allows configuration of arbitrary OpenSSL configuration
// http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_conf_command // http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_conf_command
SSLConfCommand []string `json:"ssl-conf-command,omitempty"` SSLConfCommands []string `json:"ssl-conf-command,omitempty"`
// Enabled ciphers list to enabled. The ciphers are specified in the format understood by // Enabled ciphers list to enabled. The ciphers are specified in the format understood by
// the OpenSSL library // the OpenSSL library
@ -777,7 +777,7 @@ func NewDefault() Configuration {
defBlockEntity := make([]string, 0) defBlockEntity := make([]string, 0)
defNginxStatusIpv4Whitelist := make([]string, 0) defNginxStatusIpv4Whitelist := make([]string, 0)
defNginxStatusIpv6Whitelist := make([]string, 0) defNginxStatusIpv6Whitelist := make([]string, 0)
defSSLConfCommand := make([]string, 0) defSSLConfCommands := make([]string, 0)
defResponseHeaders := make([]string, 0) defResponseHeaders := make([]string, 0)
defIPCIDR = append(defIPCIDR, "0.0.0.0/0") defIPCIDR = append(defIPCIDR, "0.0.0.0/0")
defNginxStatusIpv4Whitelist = append(defNginxStatusIpv4Whitelist, "127.0.0.1") defNginxStatusIpv4Whitelist = append(defNginxStatusIpv4Whitelist, "127.0.0.1")
@ -847,7 +847,7 @@ func NewDefault() Configuration {
ReusePort: true, ReusePort: true,
ShowServerTokens: false, ShowServerTokens: false,
SSLBufferSize: sslBufferSize, SSLBufferSize: sslBufferSize,
SSLConfCommand: defSSLConfCommand, SSLConfCommands: defSSLConfCommands,
SSLCiphers: sslCiphers, SSLCiphers: sslCiphers,
SSLECDHCurve: "auto", SSLECDHCurve: "auto",
SSLProtocols: sslProtocols, SSLProtocols: sslProtocols,

4
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -450,9 +450,9 @@ http {
# slightly reduce the time-to-first-byte # slightly reduce the time-to-first-byte
ssl_buffer_size {{ $cfg.SSLBufferSize }}; ssl_buffer_size {{ $cfg.SSLBufferSize }};
{{ if gt (len $cfg.SSLConfCommand) 0 }} {{ if gt (len $cfg.SSLConfCommands) 0 }}
# allow to specify specific openssl commands # allow to specify specific openssl commands
{{ range $sslConfCmd := $cfg.SSLConfCommand }} {{ range $sslConfCmd := $cfg.SSLConfCommands }}
ssl_conf_command {{ $sslConfCmd }}; ssl_conf_command {{ $sslConfCmd }};
{{ end }} {{ end }}
{{ end }} {{ end }}