Commit ac3e0dda authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'cguitarte-update-geo-configuration-14.6' into 'master'

Update to make it more clear how to config geo.

See merge request gitlab-org/gitlab!77426
parents 1e0ddc40 b5ab5dc1
...@@ -199,20 +199,21 @@ keys must be manually replicated to the **secondary** site. ...@@ -199,20 +199,21 @@ keys must be manually replicated to the **secondary** site.
gitlab-ctl reconfigure gitlab-ctl reconfigure
``` ```
1. On the top bar, select **Menu > Admin**. 1. Navigate to the Primary Node GitLab Instance:
1. On the left sidebar, select **Geo > Sites**. 1. On the top bar, select **Menu > Admin**.
1. Select **New site**. 1. On the left sidebar, select **Geo > Sites**.
1. Select **Add site**.
![Add secondary site](img/adding_a_secondary_v13_3.png) ![Add secondary site](img/adding_a_secondary_v13_3.png)
1. Fill in **Name** with the `gitlab_rails['geo_node_name']` in 1. Fill in **Name** with the `gitlab_rails['geo_node_name']` in
`/etc/gitlab/gitlab.rb`. These values must always match *exactly*, character `/etc/gitlab/gitlab.rb`. These values must always match *exactly*, character
for character. for character.
1. Fill in **URL** with the `external_url` in `/etc/gitlab/gitlab.rb`. These 1. Fill in **URL** with the `external_url` in `/etc/gitlab/gitlab.rb`. These
values must always match, but it doesn't matter if one ends with a `/` and values must always match, but it doesn't matter if one ends with a `/` and
the other doesn't. the other doesn't.
1. Optionally, choose which groups or storage shards should be replicated by the 1. (Optional) Choose which groups or storage shards should be replicated by the
**secondary** site. Leave blank to replicate all. Read more in **secondary** site. Leave blank to replicate all. Read more in
[selective synchronization](#selective-synchronization). [selective synchronization](#selective-synchronization).
1. Select **Add site** to add the **secondary** site. 1. Select **Save changes** to add the **secondary** site.
1. SSH into **each Rails, and Sidekiq node on your secondary** site and restart the services: 1. SSH into **each Rails, and Sidekiq node on your secondary** site and restart the services:
```shell ```shell
......
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