diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-10 15:31:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-10 15:31:09 +0000 |
| commit | f9a8db5a1fcdf69f223a09f74edba78a48e3b1db (patch) | |
| tree | 0a953f2fff1466c141090095a00db95df8e48c4e | |
| parent | dc99f343afbb6e82e3639d3c33dbb103a844f083 (diff) | |
| parent | 543a68cfb55abd709a3efa2acb340b08f2361c1a (diff) | |
| download | gitlab-ce-f9a8db5a1fcdf69f223a09f74edba78a48e3b1db.tar.gz | |
Merge branch 'gitaly-config' into 'master'
Document gitaly.socket_path setting
See merge request !9858
| -rw-r--r-- | config/gitlab.yml.example | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 720df0cac2d..b4f6cba1833 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -441,6 +441,16 @@ production: &base shared: # path: /mnt/gitlab # Default: shared + # Gitaly settings + gitaly: + # The socket_path setting is optional and obsolete. When this is set + # GitLab assumes it can reach a Gitaly services via a Unix socket at + # this path. When this is commented out GitLab will not use Gitaly. + # + # This setting is obsolete because we expect it to be moved under + # repositories/storages in GitLab 9.1. + # + # socket_path: tmp/sockets/gitaly.socket # # 4. Advanced settings |