diff options
| author | antirez <antirez@gmail.com> | 2020-03-12 13:25:01 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2020-03-12 13:25:01 +0100 |
| commit | 2091d73ef5026b7a8a93b65d2d90e59d9437413c (patch) | |
| tree | f7b98e1d70452b8e4705f00657672c5a91ec46fe /redis.conf | |
| parent | 513931dfea68ae866b91b197ca7fc0e9d845bb0a (diff) | |
| parent | bd28dbee0ed53db74b21d702c23c3254cebdbc7f (diff) | |
| download | redis-2091d73ef5026b7a8a93b65d2d90e59d9437413c.tar.gz | |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
Diffstat (limited to 'redis.conf')
| -rw-r--r-- | redis.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/redis.conf b/redis.conf index 8609a9f57..c9d256bef 100644 --- a/redis.conf +++ b/redis.conf @@ -142,7 +142,8 @@ tcp-keepalive 300 # server to connected clients, masters or cluster peers. These files should be # PEM formatted. # -# tls-cert-file redis.crt tls-key-file redis.key +# tls-cert-file redis.crt +# tls-key-file redis.key # Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # @@ -175,8 +176,7 @@ 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) or -# "default" which is currently >= TLSv1.1. +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) # # tls-protocols TLSv1.2 |