Skip to content
Snippets Groups Projects
Commit d8afad33 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Merge branch 'fix-gitlab-shell-redis' into 'master'

Fix gitlab-shell redis socket config

Right now socket option is not commented in example config. See https://gitlab.com/gitlab-org/gitlab-shell/blob/master/config.yml.example#L34. This cause gitlab-shell use default socket config which is invalid

See merge request !19
parents 7f9ff35b 2342ef79
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -42,7 +42,7 @@ gitlab-shell/config.yml:
sed -e "s|/home/git|${gitlab_development_root}|"\
-e "s|:8080/|:3000|"\
-e "s|/usr/bin/redis-cli|$(shell which redis-cli)|"\
-e "s|^ # socket: .*| socket: ${gitlab_development_root}/redis/redis.socket|"\
-e "s|^ socket: .*| socket: ${gitlab_development_root}/redis/redis.socket|"\
gitlab-shell/config.yml.example > gitlab-shell/config.yml
 
gitlab-shell/.bundle:
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment