diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-11 03:35:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-11 03:35:48 +0000 |
| commit | 0b434daf52cb93ea42cb49ce15aa59dd01599181 (patch) | |
| tree | dc3915aa94508d76df2480a8e26ec4b33797a320 /scripts | |
| parent | 4daa6da5407d235cbe4f7a787eaa29304446a870 (diff) | |
| parent | cb3b4a15e6913bc28ee2ecaab017a4c3f08c438e (diff) | |
| download | gitlab-ce-0b434daf52cb93ea42cb49ce15aa59dd01599181.tar.gz | |
Merge branch '30392_support_for_multiple_key_value_stores' into 'master'
Support multiple Redis instances based on queue type
See merge request !11573
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prepare_build.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 03de59f27ad..68114d149c4 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -12,9 +12,6 @@ fi # gems could not be found under some circumstance. No idea why, hours wasted. retry gem install knapsack fog-aws mime-types -cp config/resque.yml.example config/resque.yml -sed -i 's/localhost/redis/g' config/resque.yml - cp config/gitlab.yml.example config/gitlab.yml # Determine the database by looking at the job name. @@ -37,6 +34,18 @@ else # Assume it's mysql sed -i 's/# host:.*/host: mysql/g' config/database.yml fi +cp config/resque.yml.example config/resque.yml +sed -i 's/localhost/redis/g' config/resque.yml + +cp config/redis.cache.yml.example config/redis.cache.yml +sed -i 's/localhost/redis/g' config/redis.cache.yml + +cp config/redis.queues.yml.example config/redis.queues.yml +sed -i 's/localhost/redis/g' config/redis.queues.yml + +cp config/redis.shared_state.yml.example config/redis.shared_state.yml +sed -i 's/localhost/redis/g' config/redis.shared_state.yml + if [ "$SETUP_DB" != "false" ]; then bundle exec rake db:drop db:create db:schema:load db:migrate |