diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md index c174cf043..ba0615ae1 100755 --- a/docs/user-guide/nginx-configuration/configmap.md +++ b/docs/user-guide/nginx-configuration/configmap.md @@ -82,7 +82,7 @@ The following table shows a configuration option's name, type, and the default v |[plugins](#plugins)|[]string| | |[reuse-port](#reuse-port)|bool|"true"| |[server-tokens](#server-tokens)|bool|"false"| -|[ssl-conf-command](#ssl-conf-command)|string|""| +|[ssl-conf-command](#ssl-conf-command)|[]string| | |[ssl-ciphers](#ssl-ciphers)|string|"ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"| |[ssl-ecdh-curve](#ssl-ecdh-curve)|string|"auto"| |[ssl-dh-param](#ssl-dh-param)|string|""| diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 4fc985086..67dfd58ce 100755 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -450,11 +450,12 @@ http { # slightly reduce the time-to-first-byte ssl_buffer_size {{ $cfg.SSLBufferSize }}; - {{ if not (empty $cfg.SSLCiphers) }} + {{ if gt (len $cfg.SSLConfCommand) 0 }} # allow to specify specific openssl commands {{ range $sslConfCmd := $cfg.SSLConfCommand }} ssl_conf_command {{ $sslConfCmd }}; {{ end }} + {{ end }} {{ if not (empty $cfg.SSLCiphers) }} # allow configuring custom ssl ciphers