diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 15:09:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 15:09:50 +0000 |
| commit | de2fb5b82c92c90f90ed67ced45143c04e934fb8 (patch) | |
| tree | ff8e5e642580de7bb596d90dd0e7f739f44ca540 /doc/administration/geo | |
| parent | c6a33b298229f9e04933be43d6176c476ef03012 (diff) | |
| download | gitlab-ce-de2fb5b82c92c90f90ed67ced45143c04e934fb8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/geo')
| -rw-r--r-- | doc/administration/geo/replication/external_database.md | 2 | ||||
| -rw-r--r-- | doc/administration/geo/replication/high_availability.md | 6 | ||||
| -rw-r--r-- | doc/administration/geo/replication/index.md | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/geo/replication/external_database.md b/doc/administration/geo/replication/external_database.md index f0fff3c6712..fd14c100ffb 100644 --- a/doc/administration/geo/replication/external_database.md +++ b/doc/administration/geo/replication/external_database.md @@ -129,7 +129,7 @@ To configure the connection to the external read-replica database and enable Log database to keep track of replication status and automatically recover from potential replication issues. Omnibus automatically configures a tracking database when `roles ['geo_secondary_role']` is set. For high availability, -refer to [Geo High Availability](../../high_availability/README.md). +refer to [Geo High Availability](../../availability/index.md). If you want to run this database external to Omnibus, please follow the instructions below. The tracking database requires an [FDW](https://www.postgresql.org/docs/9.6/postgres-fdw.html) diff --git a/doc/administration/geo/replication/high_availability.md b/doc/administration/geo/replication/high_availability.md index d64262e0399..5099e73d5e8 100644 --- a/doc/administration/geo/replication/high_availability.md +++ b/doc/administration/geo/replication/high_availability.md @@ -47,12 +47,12 @@ It is possible to use cloud hosted services for PostgreSQL and Redis, but this i ## Prerequisites: Two working GitLab HA clusters One cluster will serve as the **primary** node. Use the -[GitLab HA documentation](../../high_availability/README.md) to set this up. If +[GitLab HA documentation](../../availability/index.md) to set this up. If you already have a working GitLab instance that is in-use, it can be used as a **primary**. The second cluster will serve as the **secondary** node. Again, use the -[GitLab HA documentation](../../high_availability/README.md) to set this up. +[GitLab HA documentation](../../availability/index.md) to set this up. It's a good idea to log in and test it, however, note that its data will be wiped out as part of the process of replicating from the **primary**. @@ -371,7 +371,7 @@ more information. The minimal reference architecture diagram above shows all application services running together on the same machines. However, for high availability we -[strongly recommend running all services separately](../../high_availability/README.md). +[strongly recommend running all services separately](../../availability/index.md). For example, a Sidekiq server could be configured similarly to the frontend application servers above, with some changes to run only the `sidekiq` service: diff --git a/doc/administration/geo/replication/index.md b/doc/administration/geo/replication/index.md index 74f9f8c05f4..7c661abef9a 100644 --- a/doc/administration/geo/replication/index.md +++ b/doc/administration/geo/replication/index.md @@ -2,7 +2,7 @@ > - Introduced in GitLab Enterprise Edition 8.9. > - Using Geo in combination with -> [High Availability](../../high_availability/README.md) +> [High Availability](../../availability/index.md) > is considered **Generally Available** (GA) in > [GitLab Premium](https://about.gitlab.com/pricing/) 10.4. |