From 4acc9d8f41ad0bc3a22dad61286d096605413171 Mon Sep 17 00:00:00 2001
From: "Simon L." <szaimen@e.mail.de>
Date: Tue, 14 Jan 2025 14:25:17 +0100
Subject: [PATCH] add idea

Signed-off-by: Simon L. <szaimen@e.mail.de>
---
 Containers/nextcloud/Dockerfile              | 2 +-
 Containers/nextcloud/config/redis.config.php | 4 ++--
 Containers/notify-push/start.sh              | 4 ++++
 Containers/whiteboard/start.sh               | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile
index 172b57b5..50692fbf 100644
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@@ -147,7 +147,7 @@ RUN set -ex; \
     \
     { \
         echo 'session.save_handler = redis'; \
-        echo 'session.save_path = "tcp://${REDIS_HOST}:6379?database=${REDIS_DB_INDEX}&auth[]=${REDIS_USER}&auth[]=${REDIS_HOST_PASSWORD}"'; \
+        echo 'session.save_path = "tcp://${REDIS_HOST}:6379?database=${REDIS_DB_INDEX}${REDIS_USER_AUTH}&auth[]=${REDIS_HOST_PASSWORD}"'; \
         echo 'redis.session.locking_enabled = 1'; \
         echo 'redis.session.lock_retries = -1'; \
         echo 'redis.session.lock_wait_time = 10000'; \
diff --git a/Containers/nextcloud/config/redis.config.php b/Containers/nextcloud/config/redis.config.php
index 7e4edec2..80848974 100644
--- a/Containers/nextcloud/config/redis.config.php
+++ b/Containers/nextcloud/config/redis.config.php
@@ -19,7 +19,7 @@ if (getenv('REDIS_HOST')) {
     $CONFIG['redis']['dbindex'] = (int) getenv('REDIS_DB_INDEX');
   }
 
-  if (getenv('REDIS_USER') !== false) {
-    $CONFIG['redis']['user'] = getenv('REDIS_USER');
+  if (getenv('REDIS_USER_AUTH') !== false) {
+    $CONFIG['redis']['user'] = str_replace("&auth[]=", "", getenv('REDIS_USER_AUTH'));
   }
 }
diff --git a/Containers/notify-push/start.sh b/Containers/notify-push/start.sh
index eda094d1..6ff81fec 100644
--- a/Containers/notify-push/start.sh
+++ b/Containers/notify-push/start.sh
@@ -62,6 +62,10 @@ fi
 
 # Set sensitive values as env
 export DATABASE_URL="$DATABASE_TYPE://oc_$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB"
+if [ -n "$REDIS_USER_AUTH" ]; then
+    # shellcheck disable=SC2001
+    REDIS_USER="$(echo "$REDIS_USER_AUTH" | sed 's|&auth[]=||')"
+fi
 export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST/$REDIS_DB_INDEX"
 
 # Run it
diff --git a/Containers/whiteboard/start.sh b/Containers/whiteboard/start.sh
index 576bd094..8390c923 100644
--- a/Containers/whiteboard/start.sh
+++ b/Containers/whiteboard/start.sh
@@ -11,6 +11,10 @@ if [ -z "$REDIS_DB_INDEX" ]; then
     REDIS_DB_INDEX=0
 fi
 
+if [ -n "$REDIS_USER_AUTH" ]; then
+    # shellcheck disable=SC2001
+    REDIS_USER="$(echo "$REDIS_USER_AUTH" | sed 's|&auth[]=||')"
+fi
 export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST/$REDIS_DB_INDEX"
 
 # Run it