From 5893b30da8158de120a29fa82a0067babeabd5cc Mon Sep 17 00:00:00 2001
From: canoine <8430237+canoine@users.noreply.github.com>
Date: Tue, 26 Jul 2022 19:32:37 +0200
Subject: [PATCH 1/5] Add redis username to fit 6+ ACL capabilities

---
 .env.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.example b/.env.example
index f2d0531763..0de2512617 100644
--- a/.env.example
+++ b/.env.example
@@ -111,6 +111,9 @@ REDIS_PATH=
 # use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
 REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
+
+# defaults to 'default'. Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
+REDIS_USERNAME=
 REDIS_PASSWORD=null
 
 # always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.

From 121561da3eec94bd26f0612d90b92b9c9578f6f1 Mon Sep 17 00:00:00 2001
From: canoine <8430237+canoine@users.noreply.github.com>
Date: Tue, 26 Jul 2022 19:33:29 +0200
Subject: [PATCH 2/5] Add redis username to fit 6+ ACL capabilities

---
 config/database.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/database.php b/config/database.php
index 6d017ae602..81a50c3602 100644
--- a/config/database.php
+++ b/config/database.php
@@ -159,6 +159,7 @@ return [
             'path'     => envNonEmpty('REDIS_PATH'),
             'host'     => envNonEmpty('REDIS_HOST', '127.0.0.1'),
             'port'     => envNonEmpty('REDIS_PORT', 6379),
+            'username' => env('REDIS_USERNAME', 'default'),
             'password' => env('REDIS_PASSWORD', null),
             'database' => env('REDIS_CACHE_DB', '1'),
         ],

From 38ed7c15435148ce74d0c5f9892abdad9aa8bf84 Mon Sep 17 00:00:00 2001
From: canoine <8430237+canoine@users.noreply.github.com>
Date: Wed, 27 Jul 2022 05:05:36 +0200
Subject: [PATCH 3/5] Don't force a default username

---
 config/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/database.php b/config/database.php
index 81a50c3602..c2ed4fbd78 100644
--- a/config/database.php
+++ b/config/database.php
@@ -159,7 +159,7 @@ return [
             'path'     => envNonEmpty('REDIS_PATH'),
             'host'     => envNonEmpty('REDIS_HOST', '127.0.0.1'),
             'port'     => envNonEmpty('REDIS_PORT', 6379),
-            'username' => env('REDIS_USERNAME', 'default'),
+            'username' => env('REDIS_USERNAME'),
             'password' => env('REDIS_PASSWORD', null),
             'database' => env('REDIS_CACHE_DB', '1'),
         ],

From 9fbc4c2ba11c96e47c3fc95ec83444f8abb27355 Mon Sep 17 00:00:00 2001
From: canoine <8430237+canoine@users.noreply.github.com>
Date: Wed, 27 Jul 2022 05:07:04 +0200
Subject: [PATCH 4/5] Don't force a default username

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 0de2512617..3f04464d51 100644
--- a/.env.example
+++ b/.env.example
@@ -112,7 +112,7 @@ REDIS_PATH=
 REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 
-# defaults to 'default'. Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
+# Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
 REDIS_USERNAME=
 REDIS_PASSWORD=null
 

From 34e54330826de9b667256bda69e4e6fd626f7a12 Mon Sep 17 00:00:00 2001
From: canoine <8430237+canoine@users.noreply.github.com>
Date: Wed, 27 Jul 2022 05:51:09 +0200
Subject: [PATCH 5/5] Empty REDIS_PASSWORD

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 3f04464d51..9cbff6467e 100644
--- a/.env.example
+++ b/.env.example
@@ -114,7 +114,7 @@ REDIS_PORT=6379
 
 # Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
 REDIS_USERNAME=
-REDIS_PASSWORD=null
+REDIS_PASSWORD=
 
 # always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
 REDIS_DB="0"