Merge branch 'jramsay-3497-geo-step-order-docs' into 'master'

Geo: order of steps in docs is important

See merge request gitlab-org/gitlab-ee!3273

doc/gitlab-geo/configuration.md

@@ -5,12 +5,18 @@ This is the documentation for the Omnibus GitLab packages. For installations
 from source, follow the [**GitLab Geo nodes configuration for installations
 from source**](configuration_source.md) guide.
 
+>**Note:**
+Stages of the setup process must be completed in the documented order.
+Before attempting the steps in this stage, complete all prior stages.
+
 1. [Install GitLab Enterprise Edition][install-ee] on the server that will serve
-   as the secondary Geo node. Do not login or set up anything else in the
+   as the **secondary** Geo node. Do not login or set up anything else in the
    secondary node for the moment.
+1. [Upload the GitLab License](../user/admin_area/license.md) to the **primary** Geo Node to unlock GitLab Geo.
 1. [Setup the database replication](database.md) (`primary (read-write) <-> secondary (read-only)` topology).
 1. [Configure SSH authorizations to use the database](ssh.md)
 1. **Configure GitLab to set the primary and secondary nodes.**
+1. Optional: [Configure a secondary LDAP server](../administration/auth/ldap.md) for the secondary. See [notes on LDAP](#ldap).
 1. [Follow the after setup steps](after_setup.md).
 
 [install-ee]: https://about.gitlab.com/downloads-ee/ "GitLab Enterprise Edition Omnibus packages downloads page"

doc/gitlab-geo/configuration_source.md

@@ -5,9 +5,14 @@ This is the documentation for installations from source. For installations
 using the Omnibus GitLab packages, follow the
 [**Omnibus GitLab Geo nodes configuration**](configuration.md) guide.
 
+>**Note:**
+Stages of the setup process must be completed in the documented order.
+Before attempting the steps in this stage, complete all prior stages.
+
 1. [Install GitLab Enterprise Edition][install-ee-source] 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.
+   will serve as the **secondary** Geo node. Do not login or set up anything
+   else in the secondary node for the moment.
+1. [Upload the GitLab License](../user/admin_area/license.md) you purchased for GitLab Enterprise Edition to unlock GitLab Geo.
 1. [Setup the database replication](database_source.md) (`primary (read-write) <-> secondary (read-only)` topology).
 1. [Configure SSH authorizations to use the database](ssh.md)
 1. **Configure GitLab to set the primary and secondary nodes.**

doc/gitlab-geo/database.md

@@ -5,11 +5,18 @@ This is the documentation for the Omnibus GitLab packages. For installations
 from source, follow the
 [**database replication for installations from source**](database_source.md) guide.
 
+>**Note:**
+Stages of the setup process must be completed in the documented order.
+Before attempting the steps in this stage, complete all prior stages.
+
 1. [Install GitLab Enterprise Edition][install-ee] on the server that will serve
-   as the secondary Geo node. Do not login or set up anything else in the
+   as the **secondary** Geo node. Do not login or set up anything else in the
    secondary node for the moment.
-1. **Setup the database replication topology:** `primary (read-write) <-> secondary (read-only)`
+1. [Upload the GitLab License](../user/admin_area/license.md) to the **primary** Geo Node to unlock GitLab Geo.
+1. **Setup the database replication** (`primary (read-write) <-> secondary (read-only)` topology).
+1. [Configure SSH authorizations to use the database](ssh.md)
 1. [Configure GitLab](configuration.md) to set the primary and secondary nodes.
+1. Optional: [Configure a secondary LDAP server](../administration/auth/ldap.md) for the secondary. See [notes on LDAP](#ldap).
 1. [Follow the after setup steps](after_setup.md).
 
 [install-ee]: https://about.gitlab.com/downloads-ee/ "GitLab Enterprise Edition Omnibus packages downloads page"

doc/gitlab-geo/database_source.md

@@ -5,10 +5,16 @@ This is the documentation for installations from source. For installations
 using the Omnibus GitLab packages, follow the
 [**database replication for Omnibus GitLab**](database.md) guide.
 
+>**Note:**
+Stages of the setup process must be completed in the documented order.
+Before attempting the steps in this stage, complete all prior stages.
+
 1. [Install GitLab Enterprise Edition][install-ee-source] 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. **Setup the database replication topology:** `primary (read-write) <-> secondary (read-only)`
+   will serve as the **secondary** Geo node. Do not login or set up anything
+   else in the secondary node for the moment.
+1. [Upload the GitLab License](../user/admin_area/license.md) you purchased for GitLab Enterprise Edition to unlock GitLab Geo.
+1. **Setup the database replication topology** (`primary (read-write) <-> secondary (read-only)`)
+1. [Configure SSH authorizations to use the database](ssh.md)
 1. [Configure GitLab](configuration_source.md) to set the primary and secondary
    nodes.
 1. [Follow the after setup steps](after_setup.md).