aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-21 11:06:09 +02:00
Code Activity

Update docker-entrypoint.sh

Browse source
This commit is contained in:
wasbeer 2022-02-20 17:56:03 +01:00 • committed by GitHub
parent ababef74e9
commit 1f6af957f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
docker-entrypoint.sh
View file

@ -43,6 +43,22 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
# change uid/gid of www-data
if [ "$(id -u)" = 0 ]; then
CURRENT_UID=$(id -u www-data)
CURRENT_GID=$(id -g www-data)
if [ -n "${UID+x}" ] && [ "$UID" -ne $CURRENT_UID ]; then
echo "Change UID of www-data from $CURRENT_UID to $UID"
usermod -u $UID www-data
find / -xdev -user $CURRENT_UID -exec chown -h www-data {} \;
fi
if [ -n "${GID+x}" ] && [ "$GID" -ne $CURRENT_GID ]; then
echo "Change GID of www-data from $CURRENT_GID to $GID"
groupmod -g $GID www-data
find / -xdev -group $CURRENT_GID -exec chgrp -h www-data {} \;
fi
fi
if expr "$1" : "apache" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
@ -54,7 +70,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"
{ {
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis' echo 'session.save_handler = redis'
# 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
@ -69,11 +84,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
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
echo "redis.session.locking_enabled = 1"
echo "redis.session.lock_retries = -1"
# redis.session.lock_wait_time is specified in microseconds.
# Wait 10ms before retrying the lock rather than the default 2ms.
echo "redis.session.lock_wait_time = 10000"
} > /usr/local/etc/php/conf.d/redis-session.ini } > /usr/local/etc/php/conf.d/redis-session.ini
fi fi