Commit d190f4cc authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-19' into 'master'

improve gitaly on seperate server storage details

See merge request gitlab-org/gitlab-ce!21036
parents 47df270d a24fa18c
...@@ -101,7 +101,9 @@ documentation on configuring Gitaly ...@@ -101,7 +101,9 @@ documentation on configuring Gitaly
authentication](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication) authentication](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication)
. .
In most or all cases the storage paths below end in `/repositories`. Check the >
**NOTE:** In most or all cases the storage paths below end in `/repositories` which is
different than `path` in `git_data_dirs` of Omnibus installations. Check the
directory layout on your Gitaly server to be sure. directory layout on your Gitaly server to be sure.
Omnibus installations: Omnibus installations:
...@@ -133,8 +135,8 @@ gitaly['listen_addr'] = "0.0.0.0:8075" ...@@ -133,8 +135,8 @@ gitaly['listen_addr'] = "0.0.0.0:8075"
gitaly['auth_token'] = 'abc123secret' gitaly['auth_token'] = 'abc123secret'
gitaly['storage'] = [ gitaly['storage'] = [
{ 'name' => 'default', 'path' => '/path/to/default/repositories' }, { 'name' => 'default', 'path' => '/mnt/gitlab/default/repositories' },
{ 'name' => 'storage1', 'path' => '/path/to/storage1/repositories' }, { 'name' => 'storage1', 'path' => '/mnt/gitlab/storage1/repositories' },
] ]
``` ```
...@@ -149,11 +151,11 @@ token = 'abc123secret' ...@@ -149,11 +151,11 @@ token = 'abc123secret'
[[storage] [[storage]
name = 'default' name = 'default'
path = '/path/to/default/repositories' path = '/mnt/gitlab/default/repositories'
[[storage]] [[storage]]
name = 'storage1' name = 'storage1'
path = '/path/to/storage1/repositories' path = '/mnt/gitlab/storage1/repositories'
``` ```
Again, reconfigure (Omnibus) or restart (source). Again, reconfigure (Omnibus) or restart (source).
......
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