Commit aaef2603 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'dewet-geo-docs' into 'master'

Refactor instructions for Geo docs

When I followed these instructions, it was hard to keep my place, or get a feel for how close I am to the beginning or the end, so I am trying to create a numbered list for the **Secondary Node** instructions, but doing formatting while keeping it as a list is proving to be really hard.

/cc @axil

See merge request !864
parents 3e51eeca 437c4c8d
...@@ -43,18 +43,14 @@ Keep in mind that: ...@@ -43,18 +43,14 @@ Keep in mind that:
## Setup instructions ## Setup instructions
GitLab Geo requires some additional work installing and configuring your In order to set up one or more GitLab Geo instances, follow the steps below in
instance, than a normal setup. this **exact order**:
There are a couple of things you need to do in order to have one or more GitLab 1. Follow the first 3 steps to [install GitLab Enterprise Edition][install-ee]
Geo instances. Follow the steps below in the **exact order** that they appear: on the server that will serve as the secondary Geo node. Do not login or
set up anything else in the secondary node for the moment.
1. Follow the instructions to [install GitLab Enterprise Edition][install-ee] 1. [Setup the database replication](database.md) (`primary <-> secondary (read-only)` topology)
on the server that will serve as the secondary Geo node, but don't further 1. [Configure GitLab](configuration.md) to set the primary and secondary nodes.
configure GitLab as authentication will be handled by the primary node (more
on this in the configuration step).
1. [Setup a database replication](database.md) in `primary <-> secondary (read-only)` topology.
1. [Configure GitLab](configuration.md) and set the primary and secondary nodes.
## After setup ## After setup
......
This diff is collapsed.
This diff is collapsed.
# Geo nodes admin area
For more information about setting up GitLab Geo, read the
[Geo documentation](../../gitlab-geo/README.md).
When you're done, you can navigate to **Admin area ➔ Geo nodes** (`/admin/geo_nodes`).
In the following table you can see what all these settings mean:
| Setting | Description |
| --------- | ----------- |
| Primary | This marks a Geo Node as primary. There can be only one primary, make sure that you first add the primary node and then all the others. |
| URL | Your instance's full URL, in the same way it is configured in `/etc/gitlab/gitlab.rb` (Omnibus GitLab installations) or `gitlab.yml` (source based installations). |
| Public Key | The SSH public key of the user that your GitLab instance runs on (unless changed, should be the user `git`). |
A primary node will have a star right next to it to distinguish from the
secondaries.
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