Set redis password (#856)17.0.0beta4-fpm-alpine17.0.0beta4-fpm17.0.0beta4-apache17.0.0beta417.0.0-beta-fpm-alpine17.0.0-beta-fpm17.0.0-beta-apache17.0.0-beta17.0-beta-fpm-alpine17.0-beta-fpm17.0-beta-apache17.0-beta17-beta-fpm-alpine17-beta-fpm17-beta-apache17-beta16.0.4-fpm-alpine16.0.4-fpm16.0.4-apache16.0.415.0.11-fpm-alpine15.0.11-fpm15.0.11-apache15.0.1114.0.14-fpm-alpine14.0.14-fpm14.0.14-apache14.0.1414.0-fpm-alpine14.0-fpm14.0-apache14.014-fpm-alpine14-fpm14-apache14

6 files changed, 21 insertions, 3 deletions

diff --git a/16.0/apache/config/redis.config.php b/16.0/apache/config/redis.config.php
index 5df799f2..19676160 100644
--- a/16.0/apache/config/redis.config.php
+++ b/16.0/apache/config/redis.config.php
@@ -6,6 +6,7 @@ if (getenv('REDIS_HOST')) {
     'redis' => array(
       'host' => getenv('REDIS_HOST'),
       'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+      'password' => getenv('REDIS_HOST_PASSWORD'),
     ),
   );
 }
diff --git a/16.0/apache/entrypoint.sh b/16.0/apache/entrypoint.sh
index 0be9d287..9514d881 100755
--- a/16.0/apache/entrypoint.sh
+++ b/16.0/apache/entrypoint.sh
@@ -25,7 +25,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         echo "Configuring Redis as session handler"
         {
             echo 'session.save_handler = redis'
-            echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+            # check if redis password has been set
+            if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+            else
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+            fi
         } > /usr/local/etc/php/conf.d/redis-session.ini
     fi
 
diff --git a/16.0/fpm-alpine/config/redis.config.php b/16.0/fpm-alpine/config/redis.config.php
index 5df799f2..19676160 100644
--- a/16.0/fpm-alpine/config/redis.config.php
+++ b/16.0/fpm-alpine/config/redis.config.php
@@ -6,6 +6,7 @@ if (getenv('REDIS_HOST')) {
     'redis' => array(
       'host' => getenv('REDIS_HOST'),
       'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+      'password' => getenv('REDIS_HOST_PASSWORD'),
     ),
   );
 }
diff --git a/16.0/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh
index 0be9d287..9514d881 100755
--- a/16.0/fpm-alpine/entrypoint.sh
+++ b/16.0/fpm-alpine/entrypoint.sh
@@ -25,7 +25,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         echo "Configuring Redis as session handler"
         {
             echo 'session.save_handler = redis'
-            echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+            # check if redis password has been set
+            if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+            else
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+            fi
         } > /usr/local/etc/php/conf.d/redis-session.ini
     fi
 
diff --git a/16.0/fpm/config/redis.config.php b/16.0/fpm/config/redis.config.php
index 5df799f2..19676160 100644
--- a/16.0/fpm/config/redis.config.php
+++ b/16.0/fpm/config/redis.config.php
@@ -6,6 +6,7 @@ if (getenv('REDIS_HOST')) {
     'redis' => array(
       'host' => getenv('REDIS_HOST'),
       'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+      'password' => getenv('REDIS_HOST_PASSWORD'),
     ),
   );
 }
diff --git a/16.0/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh
index 0be9d287..9514d881 100755
--- a/16.0/fpm/entrypoint.sh
+++ b/16.0/fpm/entrypoint.sh
@@ -25,7 +25,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         echo "Configuring Redis as session handler"
         {
             echo 'session.save_handler = redis'
-            echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+            # check if redis password has been set
+            if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+            else
+                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
+            fi
         } > /usr/local/etc/php/conf.d/redis-session.ini
     fi