diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 15:09:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 15:09:01 +0000 |
| commit | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch) | |
| tree | a2f25dbea26c81e88b169c55a6275e3969323e82 /doc/administration/gitaly | |
| parent | b84eeb256c4a780d902faee1f99ca9a711b3214a (diff) | |
| download | gitlab-ce-b304a72312465ed4c0a568ee6a6ea5e97f705c9b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/gitaly')
| -rw-r--r-- | doc/administration/gitaly/praefect.md | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 073e2010fd2..7f314bc5e31 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -261,7 +261,10 @@ gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN' # Configure the gitlab-shell API callback URL. Without this, `git push` will # fail. This can be your 'front door' GitLab URL or an internal load # balancer. -gitlab_rails['internal_api_url'] = 'https://gitlab.example.com' +# Possible values could be: 'http://10.23.101.53', 'https://gitlab.example.com', +# etc. Please replace GITLAB_SERVER_ADDRESS with proper value and change schema +# to 'https' in case you use encrypted connection. +gitlab_rails['internal_api_url'] = 'http://GITLAB_SERVER_ADDRESS' # Replace PRAEFECT_INTERNAL_TOKEN below with a real secret. gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN' @@ -324,6 +327,12 @@ git_data_dirs({ # Replace GITLAB_SHELL_SECRET_TOKEN below with real secret gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN' + +# Possible values could be: 'http://10.23.101.53', 'https://gitlab.example.com', +# etc. Please replace GITLAB_SERVER_ADDRESS with proper value and change schema +# to 'https' in case you use encrypted connection. For more info please refer +# to https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab +external_url "http://<GITLAB_SERVER_ADDRESS>" ``` Replace `GITLAB_SHELL_SECRET_TOKEN` and `PRAEFECT_EXTERNAL_TOKEN` |