Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redis patch #735

Closed
wants to merge 2 commits into from
Closed

Redis patch #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfe84fc
Update docker-entrypoint.sh
epma01 May 1, 2019
891ef3f
Update redis.config.php
epma01 May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion .config/redis.config.php
View file
Open in desktop
Expand Up @@ -5,8 +5,13 @@
'memcache.locking' => '\OC\Memcache\Redis',
'redis' => array(
'host' => getenv('REDIS_HOST'),
'port' => getenv('REDIS_HOST_PORT') ?: 6379,
),
);
if(getenv('REDIS_HOST_PORT') !== false) {
$CONFIG['redis']['port'] = getenv('REDIS_HOST_PORT');
}
else if (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
}

6 changes: 5 additions & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Expand Up @@ -25,7 +25,11 @@ 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}\""
if [[ ${REDIS_HOST:0:1} == "/" ]] ; then
echo "session.save_path = \"unix://${REDIS_HOST}?persistent=1&weight=1&database=0\""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these extra arguments required for sockets?

else
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
fi
} > /usr/local/etc/php/conf.d/redis-session.ini
fi

Expand Down