diff --git a/assets/config/gitlabhq/resque.yml b/assets/config/gitlabhq/resque.yml index 0a35982c..637299c3 100644 --- a/assets/config/gitlabhq/resque.yml +++ b/assets/config/gitlabhq/resque.yml @@ -1,3 +1,3 @@ -development: redis://localhost:6379 -test: redis://localhost:6379 +development: redis://{{REDIS_HOST}}:{{REDIS_PORT}} +test: redis://{{REDIS_HOST}}:{{REDIS_PORT}} production: redis://{{REDIS_HOST}}:{{REDIS_PORT}} diff --git a/assets/init b/assets/init index 427aceb0..63a2ba63 100755 --- a/assets/init +++ b/assets/init @@ -282,8 +282,8 @@ sudo -u git -H sed 's/{{DB_POOL}}/'"${DB_POOL}"'/' -i /home/git/gitlab/config/da sudo -u git -H sed 's/{{SIDEKIQ_CONCURRENCY}}/'"${SIDEKIQ_CONCURRENCY}"'/' -i /home/git/gitlab/config/sidekiq.yml # configure redis -sudo -u git -H sed 's/{{REDIS_HOST}}/'"${REDIS_HOST}"'/' -i /home/git/gitlab/config/resque.yml -sudo -u git -H sed 's/{{REDIS_PORT}}/'"${REDIS_PORT}"'/' -i /home/git/gitlab/config/resque.yml +sudo -u git -H sed 's/{{REDIS_HOST}}/'"${REDIS_HOST}"'/g' -i /home/git/gitlab/config/resque.yml +sudo -u git -H sed 's/{{REDIS_PORT}}/'"${REDIS_PORT}"'/g' -i /home/git/gitlab/config/resque.yml # configure gitlab-shell sudo -u git -H sed 's,{{GITLAB_URL}},'"${GITLAB_URL}"',' -i /home/git/gitlab-shell/config.yml