Remove path info as usually not requireddocs/cleanup-gitaly

1 files changed, 25 insertions, 11 deletions

diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index 0b63ee14741..0ef88a26ab9 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -171,8 +171,8 @@ Check the directory layout on your Gitaly server to be sure.
    gitaly['auth_token'] = 'abc123secret'
 
    gitaly['storage'] = [
-     { 'name' => 'default', 'path' => '/mnt/gitlab/default/repositories' },
-     { 'name' => 'storage1', 'path' => '/mnt/gitlab/storage1/repositories' },
+     { 'name' => 'default' },
+     { 'name' => 'storage1' },
    ]
 
    # To use TLS for Gitaly you need to add
@@ -181,6 +181,10 @@ Check the directory layout on your Gitaly server to be sure.
    gitaly['key_path'] = "path/to/key.pem"
    ```
 
+   NOTE: **Note:**
+   In some cases, you'll have to set `path` for `gitaly['storage']` in the
+   format `'path' => '/mnt/gitlab/<storage name>/repositories'`.
+
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
 
 **For installations from source**
@@ -200,13 +204,15 @@ Check the directory layout on your Gitaly server to be sure.
 
    [[storage]]
    name = 'default'
-   path = '/mnt/gitlab/default/repositories'
 
    [[storage]]
    name = 'storage1'
-   path = '/mnt/gitlab/storage1/repositories'
    ```
 
+   NOTE: **Note:**
+   In some cases, you'll have to set `path` for each `[[storage]]` in the
+   format `path = '/mnt/gitlab/<storage name>/repositories'`.
+
 1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source).
 
 ### 4. Converting clients to use the Gitaly server
@@ -230,13 +236,17 @@ write to `/mnt/gitlab/default` and `/mnt/gitlab/storage1` respectively.
 
    ```ruby
    git_data_dirs({
-     'default' => { 'path' => '/mnt/gitlab/default', 'gitaly_address' => 'tcp://gitaly.internal:8075' },
-     'storage1' => { 'path' => '/mnt/gitlab/storage1', 'gitaly_address' => 'tcp://gitaly.internal:8075' },
+     'default' => { 'gitaly_address' => 'tcp://gitaly.internal:8075' },
+     'storage1' => { 'gitaly_address' => 'tcp://gitaly.internal:8075' },
    })
 
    gitlab_rails['gitaly_token'] = 'abc123secret'
    ```
 
+   NOTE: **Note:**
+   In some cases, you'll have to set `path` for each `git_data_dirs` in the
+   format `'path' => '/mnt/gitlab/<storage name>'`.
+
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
 1. Tail the logs to see the requests:
 
@@ -253,16 +263,18 @@ write to `/mnt/gitlab/default` and `/mnt/gitlab/storage1` respectively.
      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:
        token: 'abc123secret'
    ```
 
+   NOTE: **Note:**
+   In some cases, you'll have to set `path` for each of the `storages` in the
+   format `path: /mnt/gitlab/<storage name>/repositories`.
+
 1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source).
 1. Tail the logs to see the requests:
 
@@ -341,7 +353,7 @@ To configure Gitaly with TLS:
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
-1. On the Gitaly server nodes, edit `/etc/gitlab/gitlab.rb`::
+1. On the Gitaly server nodes, edit `/etc/gitlab/gitlab.rb`:
 
    ```ruby
    gitaly['tls_listen_addr'] = "0.0.0.0:9999"
@@ -360,16 +372,18 @@ To configure Gitaly with TLS:
      repositories:
        storages:
          default:
-           path: /mnt/gitlab/default/repositories
            gitaly_address: tls://gitaly.internal:9999
          storage1:
-           path: /mnt/gitlab/storage1/repositories
            gitaly_address: tls://gitaly.internal:9999
 
      gitaly:
        token: 'abc123secret'
    ```
 
+   NOTE: **Note:**
+   In some cases, you'll have to set `path` for each of the `storages` in the
+   format `path: /mnt/gitlab/<storage name>/repositories`.
+
 1. Save the file and [restart GitLab](../restart_gitlab.md#installations-from-source).
 1. On the Gitaly server nodes, edit `/home/git/gitaly/config.toml`: