diff options
author | Evan Read <eread@gitlab.com> | 2019-09-12 07:33:12 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-09-12 07:33:12 +0000 |
commit | 31b76c6ee1a89ad2ecf3c55aa9635df887fae0f3 (patch) | |
tree | e70fab2e7551e2977a6eb9b027029224102a5d4e /doc | |
parent | 3de934cb4f9c7f8efaba76b8e78b7221d8807aa7 (diff) | |
parent | b7b2207e013ee80d8849b5541eb7276e7793b275 (diff) | |
download | gitlab-ce-31b76c6ee1a89ad2ecf3c55aa9635df887fae0f3.tar.gz |
Merge branch 'da-geo-high-availability-docs' into 'master'
Geo - Update HA docs to recommend Gitaly over NFS
See merge request gitlab-org/gitlab-ce!32912
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/geo/replication/high_availability.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/administration/geo/replication/high_availability.md b/doc/administration/geo/replication/high_availability.md index c737fa37077..a0684cfa726 100644 --- a/doc/administration/geo/replication/high_availability.md +++ b/doc/administration/geo/replication/high_availability.md @@ -88,16 +88,20 @@ major differences: Therefore, we will set up the HA components one-by-one, and include deviations from the normal HA setup. -### Step 1: Configure the Redis and NFS services on the **secondary** node +### Step 1: Configure the Redis and Gitaly services on the **secondary** node Configure the following services, again using the non-Geo high availability documentation: - [Configuring Redis for GitLab HA](../../high_availability/redis.md) for high availability. -- [NFS](../../high_availability/nfs.md) which will store data that is +- [Gitaly](../../high_availability/gitaly.md), which will store data that is synchronized from the **primary** node. +NOTE: **Note:** +[NFS](../../high_availability/nfs.md) can be used in place of Gitaly but is not +recommended. + ### Step 2: Configure the main read-only replica PostgreSQL database on the **secondary** node NOTE: **Note:** The following documentation assumes the database will be run on |