From 2f3bfd1c135738722ba16c9a8320c188b465c9b7 Mon Sep 17 00:00:00 2001
From: Jamie Scott <jamie@redislabs.com>
Date: Tue, 3 Mar 2020 18:03:16 -0800
Subject: [PATCH 1/2] Update Redis.conf to improve TLS usability

When using TLS with a Redis.conf file the line for TLS reading tls-cert-file redis.crt tls-key-file redis.key is interpreted as one complete directive. I am separating this on two separate lines to improve usability so users do not get the below error.

ubuntu@ip-172-31-29-250:~/redis-6.0-rc1$ ./src/redis-server redis.conf

*** FATAL CONFIG FILE ERROR ***
Reading the configuration file, at line 145
>>> 'tls-cert-file redis.crt tls-key-file redis.key'
wrong number of arguments
ubuntu@ip-172-31-29-250:~/redis-6.0-rc1$ vi redis.conf
ubuntu@ip-172-31-29-250:~/redis-6.0-rc1$ ./src/redis-server redis.conf
23085:C 04 Mar 2020 01:58:12.631 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
23085:C 04 Mar 2020 01:58:12.631 # Redis version=5.9.101, bits=64, commit=00000000, modified=0, pid=23085, just started
23085:C 04 Mar 2020 01:58:12.631 # Configuration loaded
23085:M 04 Mar 2020 01:58:12.632 * Increased maximum number of open files to 10032 (it was originally set to 1024).
---
 redis.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/redis.conf b/redis.conf
index c04880f32..048b16302 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:
 #

From 374b1192a358525dd099d5d5fc67ff370e3b6b05 Mon Sep 17 00:00:00 2001
From: Jamie Scott <jamie@redislabs.com>
Date: Mon, 9 Mar 2020 12:53:44 -0700
Subject: [PATCH 2/2] Remove default guidance in Redis.conf

Removing the default guidance in Redis.conf since this is not an available value.
---
 redis.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/redis.conf b/redis.conf
index 048b16302..a8e2fd89d 100644
--- a/redis.conf
+++ b/redis.conf
@@ -176,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