Merge branch 'docs-evn-ssh-docs' into 'master'

Change reference to SSH instructions and page and remove next steps

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

doc/gitlab-geo/README.md

@@ -39,9 +39,9 @@ and the replicated read-only ones as **secondaries**.
 Keep in mind that:
 
 - Secondaries talk to primary to get user data for logins (API), to
-  clone/pull from repositories (SSH) and to retrieve LFS Objects and Attachments 
+  clone/pull from repositories (SSH) and to retrieve LFS Objects and Attachments
   (HTTPS + JWT).
-- Since GitLab Enterprise Edition Premium 10.0, the primary no longer talks to 
+- Since GitLab Enterprise Edition Premium 10.0, the primary no longer talks to
   secondaries to notify for changes (API).
 
 ## Use-cases
@@ -123,7 +123,7 @@ update the state.
 
 This new architecture allows us to be resilient to connectivity issues between the
 nodes. It doesn't matter if it was just a few minutes or days. The secondary
-instance will be able to replay all the events in the correct order and get in 
+instance will be able to replay all the events in the correct order and get in
 sync again.
 
 ## Setup instructions
@@ -141,7 +141,7 @@ If you installed GitLab using the Omnibus packages (highly recommended):
    secondary node for the moment.
 1. [Upload the GitLab License](../user/admin_area/license.md) on 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. [Lookup authorized SSH keys in the database](../administration/operations/speed_up_ssh.html), do this step for both primary AND secondary nodes.
 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 "Using a Geo Server" guide](using_a_geo_server.md).
@@ -157,7 +157,7 @@ If you installed GitLab from source:
    else in the secondary node for the moment.
 1. [Upload the GitLab License](../user/admin_area/license.md) on the **primary** Geo Node 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. [Lookup authorized SSH keys in the database](../administration/operations/speed_up_ssh.html), do this step for both primary AND secondary nodes.
 1. [Configure GitLab](configuration_source.md) to set the primary and secondary
    nodes.
 1. [Follow the "Using a Geo Server" guide](using_a_geo_server.md).

doc/gitlab-geo/database.md

@@ -479,13 +479,6 @@ Geo secondary nodes use a tracking database to keep track of replication
 status and recover automatically from some replication issues. Follow the
 instructions for [enabling tracking database on the secondary server][tracking].
 
-### Next steps
-
-Now that the database replication is done, the next step is to configure SSH
-authorizations to use the database.
-
-[➤ Configure SSH authorizations to use the database](ssh.md)
-
 ## MySQL replication
 
 We don't support MySQL replication for GitLab Geo.

doc/gitlab-geo/database_source.md

@@ -462,13 +462,6 @@ data before running `pg_basebackup`.
 
 The replication process is now over.
 
-### Next steps
-
-Now that the database replication is done, the next step is to configure SSH
-authorizations to use the database.
-
-[➤ Configure SSH authorizations to use the database](ssh.md)
-
 ## MySQL replication
 
 We don't support MySQL replication for GitLab Geo.

doc/gitlab-geo/ssh.md

@@ -14,21 +14,9 @@ Note this feature is only available on operating systems that support OpenSSH
 version of OpenSSH for your server]
 (../administration/operations/speed_up_ssh.html#compiling-a-custom-version-of-openssh-for-centos-6).
 
-For both primary AND secondary nodes, follow the instructions on [configuring
-SSH authorization via database
-lookups](../administration/operations/speed_up_ssh.html).
+For both primary AND secondary nodes, follow the instructions on
+[looking up authorized SSH keys in the database](../administration/operations/speed_up_ssh.html).
 
 Note that the 'Write to "authorized keys" file' checkbox only needs
 to be unchecked on the primary node since it will be reflected automatically
 in the secondary if database replication is working.
-
-### Next steps
-
-Now that SSH authorizations are configured to use the database, the next step
-is to configure GitLab.
-
-[➤ GitLab Geo configuration](configuration.md)
-
-If you are running GitLab installed from source:
-
-[➤ GitLab Geo configuration (source)](configuration_source.md)