Commit 13c4e15a authored by Carlo Landmeter's avatar Carlo Landmeter
Browse files

redis: use upstream config with changes

parent b2ce3828
--- ./config/resque.yml.example
+++ ./config/resque.yml.example
@@ -1,8 +1,8 @@
# If you change this file in a Merge Request, please also create
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
#
-development:
- url: redis://localhost:6379
+# development:
+# url: redis://localhost:6379
# sentinels:
# -
# host: localhost
@@ -10,11 +10,12 @@ development:
# -
# host: slave2
# port: 26381 # point to sentinel, not to redis port
-test:
- url: redis://localhost:6379
+# test:
+# url: redis://localhost:6379
production:
# Redis (single instance)
- url: unix:/var/run/redis/redis.sock
+ # url: unix:/var/run/redis/redis.sock
+ url: redis://redis:6379
##
# Redis + Sentinel (for HA)
#
......@@ -8,6 +8,7 @@ BASECONF="
gitlab/secrets.yml.example
gitlab/unicorn.rb.example
gitlab/puma.rb.example
gitlab/resque.yml.example
gitlab/initializers/rack_attack.rb.example
gitaly/config.toml.example
gitlab-shell/config.yml.example
......@@ -105,13 +106,6 @@ postgres_conf() {
EOF
}
redis_conf() {
cat <<- EOF > /etc/gitlab/gitlab/resque.yml
production:
url: redis://redis:6379
EOF
}
setup_ssh() {
echo "Creating ssh keys..."
local keytype
......@@ -165,7 +159,6 @@ setup() {
mkdir -p /etc/gitlab/gitlab
create_db
postgres_conf
redis_conf
install_conf
setup_ssh
prepare_dirs
......
......@@ -87,6 +87,7 @@ patch -p0 -i /tmp/gitlab/unicorn-log-to-stdout.patch
patch -p0 -i /tmp/gitlab/puma-no-redirect.patch
patch -p0 -i /tmp/logrotate/logrotate-defaults.patch
patch -p0 -i /tmp/nginx/nginx-config.patch
patch -p0 -i /tmp/resque/resque-config.patch
# temporary symlink the example configs to make setup happy
for config in gitlab.yml.example database.yml.postgresql; do
......
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