summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-13 16:08:48 +0000
committerRémy Coutable <remy@rymai.me>2017-01-13 16:08:48 +0000
commit5384c720c9c7443fc1f12ea15d55541e14feeb85 (patch)
tree95e874857f9122d4005935e59f09605b7b8093bf /doc
parent7a3ddc5214618dd9a1b761acde3502d78a66ba8c (diff)
parenta532c6040c1c150810122b172a2fad30d1753dfd (diff)
downloadgitlab-ce-5384c720c9c7443fc1f12ea15d55541e14feeb85.tar.gz
Merge branch 'env-var-in-redis-config' into 'master'
Allow to use ENV variables in redis config See merge request !8073
Diffstat (limited to 'doc')
-rw-r--r--doc/install/installation.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 9dba03b1924..9cebed34b7e 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -601,6 +601,12 @@ If you want to connect the Redis server via socket, then use the "unix:" URL sch
production:
url: unix:/path/to/redis/socket
+Also you can use environment variables in the `config/resque.yml` file:
+
+ # example
+ production:
+ url: <%= ENV.fetch('GITLAB_REDIS_URL') %>
+
### Custom SSH Connection
If you are running SSH on a non-standard port, you must change the GitLab user's SSH config.