Commit bca8c99f authored by Jan-Willem's avatar Jan-Willem

Merge branch 'redis_via_socket' into 'master'

Connect to Redis via sockets only

See merge request !14
parents ec729707 3c24e144
......@@ -15,7 +15,9 @@ gitlab/.git:
gitlab-config: gitlab/config/gitlab.yml gitlab/config/database.yml gitlab/config/unicorn.rb gitlab/config/resque.yml
sed "s|/home/git|${gitlab_development_root}|;s|# user: git|user: $(shell whoami)|" gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
sed -e "s|/home/git|${gitlab_development_root}|"\
-e "s|# user: git|user: $(shell whoami)|"\
gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
sed "s|/home/git|${gitlab_development_root}|" database.yml.example > gitlab/config/database.yml
......@@ -37,7 +39,11 @@ gitlab-shell/.git:
git clone ${gitlab_shell_repo} gitlab-shell
sed "s|/home/git|${gitlab_development_root}|;s|:8080/|:3000|;s|/usr/bin/redis-cli|$(shell which redis-cli)|" gitlab-shell/config.yml.example > 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|"\
gitlab-shell/config.yml.example > gitlab-shell/config.yml
cd ${gitlab_development_root}/gitlab-shell && bundle install --without production --jobs 4
......@@ -61,7 +67,9 @@ support-setup: Procfile redis postgresql .bundle
@echo "***********************************"
sed "s|/home/git|${gitlab_development_root}|g;s|postgres |${postgres_bin_dir}/postgres |" $@.example > $@
sed -e "s|/home/git|${gitlab_development_root}|g"\
-e "s|postgres |${postgres_bin_dir}/postgres |"\
$@.example > $@
redis: redis/redis.conf
......@@ -74,4 +82,4 @@ postgresql/data/PG_VERSION:
${postgres_bin_dir}/initdb -E utf-8 postgresql/data
bundle install --jobs 4
\ No newline at end of file
bundle install --jobs 4
......@@ -7,9 +7,6 @@ GitLab development. All data is stored inside the gitlab-development-kit
directory. All connections to supporting services go through Unix domain
sockets to avoid port conflicts.
Note: at this time Redis still uses port 6379 because that is hard-wired into
the GitLab development and test environments.
## Design goals
- Get the user started, do not try to take care of everything
port 6379
port 0
unixsocket /home/git/redis/redis.socket
development: redis://localhost:6379
test: redis://localhost:6379
development: unix:/home/git/redis/redis.socket
test: unix:/home/git/redis/redis.socket
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment