diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-10 15:31:09 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-10 13:39:33 -0800 |
| commit | 1cae506b43fc2885e7fc7d1e9147d3bb9adc189f (patch) | |
| tree | f111ee7c5786f495300110d28e807e0ecc065daa | |
| parent | 5e8f2423570b7c74cb548c1a0e13977c9befe906 (diff) | |
| download | gitlab-ce-1cae506b43fc2885e7fc7d1e9147d3bb9adc189f.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 |