Commit e3b96f13 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'patch-35' into 'master'

Minor Gitaly docs on seperate server clarification

See merge request gitlab-org/gitlab!18734
parents a365d28f 0f81d895
......@@ -86,7 +86,8 @@ Below we describe how to configure two Gitaly servers one at
`gitaly1.internal` and the other at `gitaly2.internal`
with secret token `abc123secret`. We assume
your GitLab installation has three repository storages: `default`,
`storage1` and `storage2`.
`storage1` and `storage2`. You can use as little as just one server with one
repository storage if desired.
### 1. Installation
......@@ -129,7 +130,7 @@ Configure a token on the instance that runs the GitLab Rails application.
Next, on the Gitaly servers, you need to configure storage paths, enable
the network listener and configure the token.
NOTE: **Note:** if you want to reduce the risk of downtime when you enable
NOTE: **Note:** If you want to reduce the risk of downtime when you enable
authentication you can temporarily disable enforcement, see [the
documentation on configuring Gitaly
authentication](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication)
......@@ -189,7 +190,7 @@ Check the directory layout on your Gitaly server to be sure.
1. Append the following to `/etc/gitlab/gitlab.rb` for each respective server:
For `gitaly1.internal`:
On `gitaly1.internal`:
```
gitaly['storage'] = [
......@@ -198,7 +199,7 @@ Check the directory layout on your Gitaly server to be sure.
]
```
For `gitaly2.internal`:
On `gitaly2.internal`:
```
gitaly['storage'] = [
......@@ -225,7 +226,7 @@ Check the directory layout on your Gitaly server to be sure.
1. Append the following to `/home/git/gitaly/config.toml` for each respective server:
For `gitaly1.internal`:
On `gitaly1.internal`:
```toml
[[storage]]
......@@ -235,7 +236,7 @@ Check the directory layout on your Gitaly server to be sure.
name = 'storage1'
```
For `gitaly2.internal`:
On `gitaly2.internal`:
```toml
[[storage]]
......
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