summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2020-05-21 15:49:37 +0200
committerGitHub <noreply@github.com>2020-05-21 15:49:37 +0200
commite387f5ba62cfa5720b79dcb5cec67caf5d18ba1e (patch)
tree71c9da752540abd88893911c2f1506c4daffba5e
parent9f932bcc82775218a88b8862a8601cac38a1b78e (diff)
parent39d1e392121caeac07c3f784ca12524a5e28bc69 (diff)
downloadredis-e387f5ba62cfa5720b79dcb5cec67caf5d18ba1e.tar.gz
Merge pull request #7288 from yossigo/tls-protocols-redis-conf-example
TLS: Improve tls-protocols clarity in redis.conf.
-rw-r--r--redis.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/redis.conf b/redis.conf
index a469d8b61..5cea06a47 100644
--- a/redis.conf
+++ b/redis.conf
@@ -176,9 +176,10 @@ tcp-keepalive 300
# tls-cluster yes
# Explicitly specify TLS versions to support. Allowed values are case insensitive
-# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1)
+# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or
+# any combination. To enable only TLSv1.2 and TLSv1.3, use:
#
-# tls-protocols TLSv1.2
+# tls-protocols "TLSv1.2 TLSv1.3"
# Configure allowed ciphers. See the ciphers(1ssl) manpage for more information
# about the syntax of this string.