summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-06-16 18:42:41 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-06-19 11:07:46 +0200
commit76bafc00e62b3a90252f0d229c7ce98c2691da30 (patch)
treef7abad6b427a8a059ec37a1dae005f3795531cd0 /config
parenta4a5cbf29a983d05b5fc69f8e63fc37e100c8637 (diff)
downloadgitlab-ce-76bafc00e62b3a90252f0d229c7ce98c2691da30.tar.gz
Pass Gitaly token on Ruby gRPC requests
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0b33783869b..7c7e444af3a 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -454,6 +454,8 @@ 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.
+ token: ""
#
# 4. Advanced settings
@@ -469,6 +471,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: