From 3c5ae4cf0651f26d45428877e3a7089ce6c9fe5c Mon Sep 17 00:00:00 2001 From: Andrei Zhozhin Date: Mon, 30 Jan 2023 13:54:57 +0000 Subject: [PATCH] change SSLConfCommand to SSLConfCommands --- internal/ingress/controller/config/config.go | 6 +++--- rootfs/etc/nginx/template/nginx.tmpl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go index 430662144..26480bc72 100644 --- a/internal/ingress/controller/config/config.go +++ b/internal/ingress/controller/config/config.go @@ -339,7 +339,7 @@ type Configuration struct { // Allows configuration of arbitrary OpenSSL configuration // 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 // the OpenSSL library @@ -777,7 +777,7 @@ func NewDefault() Configuration { defBlockEntity := make([]string, 0) defNginxStatusIpv4Whitelist := make([]string, 0) defNginxStatusIpv6Whitelist := make([]string, 0) - defSSLConfCommand := make([]string, 0) + defSSLConfCommands := make([]string, 0) defResponseHeaders := make([]string, 0) defIPCIDR = append(defIPCIDR, "0.0.0.0/0") defNginxStatusIpv4Whitelist = append(defNginxStatusIpv4Whitelist, "127.0.0.1") @@ -847,7 +847,7 @@ func NewDefault() Configuration { ReusePort: true, ShowServerTokens: false, SSLBufferSize: sslBufferSize, - SSLConfCommand: defSSLConfCommand, + SSLConfCommands: defSSLConfCommands, SSLCiphers: sslCiphers, SSLECDHCurve: "auto", SSLProtocols: sslProtocols, diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 67dfd58ce..e0df012f2 100755 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -450,9 +450,9 @@ http { # slightly reduce the time-to-first-byte ssl_buffer_size {{ $cfg.SSLBufferSize }}; - {{ if gt (len $cfg.SSLConfCommand) 0 }} + {{ if gt (len $cfg.SSLConfCommands) 0 }} # allow to specify specific openssl commands - {{ range $sslConfCmd := $cfg.SSLConfCommand }} + {{ range $sslConfCmd := $cfg.SSLConfCommands }} ssl_conf_command {{ $sslConfCmd }}; {{ end }} {{ end }}