Commit 9f6e4f5b authored by Evan Read's avatar Evan Read

Merge branch 'docs-hchouraria-gitaly-clients-auth-examples' into 'master'

Add auth example to gitaly client docs

See merge request gitlab-org/gitlab!60338
parents 92cab2a1 adc907c9
...@@ -378,13 +378,26 @@ server (with `gitaly_address`) unless you use ...@@ -378,13 +378,26 @@ server (with `gitaly_address`) unless you use
1. Edit `/etc/gitlab/gitlab.rb`: 1. Edit `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
# Use the same token value configured on all Gitaly servers
gitlab_rails['gitaly_token'] = '<AUTH_TOKEN>'
git_data_dirs({ git_data_dirs({
'default' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' }, 'default' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' },
'storage1' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' }, 'storage1' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' },
'storage2' => { 'gitaly_address' => 'tcp://gitaly2.internal:8075' }, 'storage2' => { 'gitaly_address' => 'tcp://gitaly2.internal:8075' },
}) })
``` ```
Alternatively, if each Gitaly server is configured to use a different authentication token:
```ruby
git_data_dirs({
'default' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075', 'gitaly_token' => '<AUTH_TOKEN_1>' },
'storage1' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075', 'gitaly_token' => '<AUTH_TOKEN_1>' },
'storage2' => { 'gitaly_address' => 'tcp://gitaly2.internal:8075', 'gitaly_token' => '<AUTH_TOKEN_2>' },
})
```
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure). 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
1. Run `sudo gitlab-rake gitlab:gitaly:check` on the Gitaly client (for example, the 1. Run `sudo gitlab-rake gitlab:gitaly:check` on the Gitaly client (for example, the
Rails application) to confirm it can connect to Gitaly servers. Rails application) to confirm it can connect to Gitaly servers.
...@@ -404,12 +417,15 @@ server (with `gitaly_address`) unless you use ...@@ -404,12 +417,15 @@ server (with `gitaly_address`) unless you use
storages: storages:
default: default:
gitaly_address: tcp://gitaly1.internal:8075 gitaly_address: tcp://gitaly1.internal:8075
gitaly_token: AUTH_TOKEN_1
path: /some/local/path path: /some/local/path
storage1: storage1:
gitaly_address: tcp://gitaly1.internal:8075 gitaly_address: tcp://gitaly1.internal:8075
gitaly_token: AUTH_TOKEN_1
path: /some/local/path path: /some/local/path
storage2: storage2:
gitaly_address: tcp://gitaly2.internal:8075 gitaly_address: tcp://gitaly2.internal:8075
gitaly_token: AUTH_TOKEN_2
path: /some/local/path path: /some/local/path
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment