Commit 197399a1 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-patch-73' into 'master'

Omit Gitaly path where not needed, add where required

See merge request gitlab-org/gitlab-ce!30241
parents 000f7ed7 bca7fa81
...@@ -247,8 +247,10 @@ gitlab: ...@@ -247,8 +247,10 @@ gitlab:
repositories: repositories:
storages: storages:
default: default:
path: /mnt/gitlab/default/repositories
gitaly_address: tcp://gitaly.internal:8075 gitaly_address: tcp://gitaly.internal:8075
storage1: storage1:
path: /mnt/gitlab/storage1/repositories
gitaly_address: tcp://gitaly.internal:8075 gitaly_address: tcp://gitaly.internal:8075
gitaly: gitaly:
...@@ -293,8 +295,8 @@ sum(rate(gitaly_connections_total[5m])) by (type) ...@@ -293,8 +295,8 @@ sum(rate(gitaly_connections_total[5m])) by (type)
```ruby ```ruby
# /etc/gitlab/gitlab.rb # /etc/gitlab/gitlab.rb
git_data_dirs({ git_data_dirs({
'default' => { 'path' => '/mnt/gitlab/default', 'gitaly_address' => 'tls://gitaly.internal:9999' }, 'default' => { 'gitaly_address' => 'tls://gitaly.internal:9999' },
'storage1' => { 'path' => '/mnt/gitlab/storage1', 'gitaly_address' => 'tls://gitaly.internal:9999' }, 'storage1' => { 'gitaly_address' => 'tls://gitaly.internal:9999' },
}) })
gitlab_rails['gitaly_token'] = 'abc123secret' gitlab_rails['gitaly_token'] = 'abc123secret'
......
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