summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-04 13:44:53 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-04 13:44:53 +0000
commit197399a15bde963c3e3df13d96146fab6896c614 (patch)
tree762c8c972628264299f509b8649d28758fedd0a5
parent000f7ed71f3a87c1361b9a64c1fd7f6a54666392 (diff)
parentbca7fa81bf438861346328e8b970d714c78ece3d (diff)
downloadgitlab-ce-197399a15bde963c3e3df13d96146fab6896c614.tar.gz
Merge branch 'docs-patch-73' into 'master'
Omit Gitaly path where not needed, add where required See merge request gitlab-org/gitlab-ce!30241
-rw-r--r--doc/administration/gitaly/index.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index a3cbc4272f0..7c7bb9045c7 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -247,8 +247,10 @@ gitlab:
repositories:
storages:
default:
+ path: /mnt/gitlab/default/repositories
gitaly_address: tcp://gitaly.internal:8075
storage1:
+ path: /mnt/gitlab/storage1/repositories
gitaly_address: tcp://gitaly.internal:8075
gitaly:
@@ -293,8 +295,8 @@ sum(rate(gitaly_connections_total[5m])) by (type)
```ruby
# /etc/gitlab/gitlab.rb
git_data_dirs({
- 'default' => { 'path' => '/mnt/gitlab/default', 'gitaly_address' => 'tls://gitaly.internal:9999' },
- 'storage1' => { 'path' => '/mnt/gitlab/storage1', 'gitaly_address' => 'tls://gitaly.internal:9999' },
+ 'default' => { 'gitaly_address' => 'tls://gitaly.internal:9999' },
+ 'storage1' => { 'gitaly_address' => 'tls://gitaly.internal:9999' },
})
gitlab_rails['gitaly_token'] = 'abc123secret'