mirror of
https://github.com/nextcloud/docker.git
synced 2025-04-20 18:56:09 +02:00
Compare commits
3 commits
5f3c6c5bb6
...
b2ea4f9850
| Author | SHA1 | Date | |
|---|---|---|---|
|
b2ea4f9850 | ||
|
abd0ba3fdb | ||
|
067ac13880 |
11 changed files with 101 additions and 21 deletions
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -114,13 +114,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
|
|
||||||
stable_channel='30.0.8'
|
stable_channel='30.0.9'
|
||||||
|
|
||||||
self="$(basename "$BASH_SOURCE")"
|
self="$(basename "$BASH_SOURCE")"
|
||||||
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue