diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-12-21 22:01:58 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-12-21 22:01:58 +0300 |
| commit | 02878551b59fe5243e6af7bc671866f1d7c1f471 (patch) | |
| tree | 91a66b88f5f942afdddd98b33ece9f2813b685f3 /config | |
| parent | a9049532a271117983430d2d80b8ad61879ecf7a (diff) | |
| parent | 907f0ce8a2c3f79fb389abec6d6315cd5b711ed8 (diff) | |
Merge branch 'support-gitaly-tls' into 'master'
Support tls communication in gitaly
See merge request gitlab-org/gitlab-ce!22602
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 1c16b999e55..7fe85f0e0d7 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -612,7 +612,7 @@ production: &base storages: # You must have at least a `default` storage path. default: path: /home/git/repositories/ - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) + gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings |