diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-21 08:41:10 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-21 08:41:10 +0000 |
| commit | 21465deef009f281c3619730e9c402d515c8f78d (patch) | |
| tree | 0ce8fd7adb8fa161007f1050bb331b858860fb30 /config | |
| parent | 3656f6cc4011ae75c740820a5c2ae70a4a5850c2 (diff) | |
| parent | 218da88e1aa7b0538d069ce9dc6e3a4348c610fc (diff) | |
| download | gitlab-ce-21465deef009f281c3619730e9c402d515c8f78d.tar.gz | |
Merge branch 'gitaly-auth-token' into 'master'
Pass Gitaly token on Ruby gRPC requests
See merge request !12228
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0b33783869b..43a8c0078ca 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -454,6 +454,10 @@ production: &base # introduced in 9.0). Eventually Gitaly use will become mandatory and # this option will disappear. enabled: true + # Default Gitaly authentication token. Can be overriden per storage. Can + # be left blank when Gitaly is running locally on a Unix socket, which + # is the normal way to deploy Gitaly. + token: # # 4. Advanced settings @@ -469,6 +473,7 @@ production: &base 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_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings backup: @@ -594,6 +599,7 @@ test: gitaly_address: unix:tmp/tests/gitaly/gitaly.socket gitaly: enabled: true + token: secret backup: path: tmp/tests/backups gitlab_shell: |