diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-04-06 16:05:06 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-04-06 18:44:18 +0300 |
| commit | 542b0d8b0194658710320ec163ec1ddbe2e8702b (patch) | |
| tree | 00850c19cadf49aace23eaf58338c8d37a426852 /doc/update | |
| parent | fd82264391c9408d4074e2a446aa9ff45c705919 (diff) | |
Use config.toml to configure Gitaly
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/9.0-to-9.1.md | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/doc/update/9.0-to-9.1.md b/doc/update/9.0-to-9.1.md index 53cddb3f290..ae983dea384 100644 --- a/doc/update/9.0-to-9.1.md +++ b/doc/update/9.0-to-9.1.md @@ -297,7 +297,10 @@ during your 9.1 upgrade **you can skip this step**. If you have not yet set up Gitaly then follow [Gitaly section of the installation guide](../install/installation.md#install-gitaly). -If you installed Gitaly in GitLab 9.0 you need to make some changes in gitlab.yml. +If you installed Gitaly in GitLab 9.0 you need to make some changes in +gitlab.yml, and create a new config.toml file. + +#### Gitaly gitlab.yml changes Look for `socket_path:` the `gitaly:` section. Its value is usually `/home/git/gitlab/tmp/sockets/private/gitaly.socket`. Note what socket @@ -318,6 +321,20 @@ the socket path, but with `unix:` in front. Each entry under `storages:` should use the same `gitaly_address`. +#### Gitaly config.toml + +In GitLab 9.1 we are replacing environment variables in Gitaly with a +TOML configuration file. + +```shell +cd /home/git/gitaly + +sudo mv env env.old +sudo -u git cp config.toml.example config.toml +# If you are using custom repository storage paths they need to be in config.toml +sudo -u git -H editor config.toml +``` + ### 11. Start application ```bash |