Merge branch 'patch-19' into 'master'

improve gitaly on seperate server storage details

See merge request gitlab-org/gitlab-ce!21036

1 files changed, 7 insertions, 5 deletions

diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index d2acc32fe71..6d7e408d41b 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -101,7 +101,9 @@ documentation on configuring Gitaly
 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.
 
 Omnibus installations:
@@ -133,8 +135,8 @@ gitaly['listen_addr'] = "0.0.0.0:8075"
 gitaly['auth_token'] = 'abc123secret'
 
 gitaly['storage'] = [
-  { 'name' => 'default', 'path' => '/path/to/default/repositories' },
-  { 'name' => 'storage1', 'path' => '/path/to/storage1/repositories' },
+  { 'name' => 'default', 'path' => '/mnt/gitlab/default/repositories' },
+  { 'name' => 'storage1', 'path' => '/mnt/gitlab/storage1/repositories' },
 ]
 ```
 
@@ -149,11 +151,11 @@ token = 'abc123secret'
 
 [[storage]
 name = 'default'
-path = '/path/to/default/repositories'
+path = '/mnt/gitlab/default/repositories'
 
 [[storage]]
 name = 'storage1'
-path = '/path/to/storage1/repositories'
+path = '/mnt/gitlab/storage1/repositories'
 ```
 
 Again, reconfigure (Omnibus) or restart (source).