Commit 120d4147 authored by Evan Read's avatar Evan Read

Merge branch 'ps-docs-mix-local-remote-gitaly' into 'master'

Docs: Gitaly cannot mix local and remote gitaly servers

Closes gitaly#2183

See merge request gitlab-org/gitlab!35009
parents ff29958f fa849967
...@@ -402,6 +402,17 @@ git_data_dirs({ ...@@ -402,6 +402,17 @@ git_data_dirs({
}) })
``` ```
You should use configuration similar to the following:
```ruby
git_data_dirs({
'default' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' },
# this should be the IP address of the GitLab server that has Gitaly running on it
'storage1' => { 'gitaly_address' => 'tcp://gitlab.internal:8075' },
'storage2' => { 'gitaly_address' => 'tcp://gitaly2.internal:8075' },
})
```
**For Omnibus GitLab** **For Omnibus GitLab**
1. Edit `/etc/gitlab/gitlab.rb`: 1. Edit `/etc/gitlab/gitlab.rb`:
......
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