Move disaster recovery back into geo

doc/administration/disaster_recovery/bring_primary_back.md → doc/administration/geo/disaster_recovery/bring_primary_back.md

@@ -16,13 +16,13 @@ that have been deleted during an idle period of a primary node, will not be dele
     sudo gitlab-ctl start
     ```
 
-Note: If you [disabled the primary permanently](index.md#step-2-permanently-disable-the-primary), you need to undo those steps now. For Debian/Ubuntu you just need to run `sudo systemctl enable gitlab-runsvdir`. For CentoOS 6, you need to install GitLab instance from scratch and setup it as a secondary node by following [Setup instructions](../../gitlab-geo/README.md#setup-instructions). In this case you don't need the step below.
+Note: If you [disabled the primary permanently](index.md#step-2-permanently-disable-the-primary), you need to undo those steps now. For Debian/Ubuntu you just need to run `sudo systemctl enable gitlab-runsvdir`. For CentoOS 6, you need to install GitLab instance from scratch and setup it as a secondary node by following [Setup instructions](../replication/index.md#setup-instructions). In this case you don't need the step below.
 
-1. [Setup database replication](../../gitlab-geo/database.md). In this documentation, primary
+1. [Setup database replication](../replication/database.md). In this documentation, primary
    refers to the current primary, and secondary refers to the former primary.
 
 If you have lost your original primary, follow the
-[setup instructions](../../gitlab-geo/README.md#setup-instructions) to set up a new secondary.
+[setup instructions](../replication/index.md#setup-instructions) to set up a new secondary.
 
 ### Promote the secondary to primary
 

doc/administration/disaster_recovery/index.md → doc/administration/geo/disaster_recovery/index.md

@@ -8,7 +8,7 @@ Geo replicates your database and your Git repositories. We will
 support and replicate more data in the future, that will enable you to
 fail-over with minimal effort, in a disaster situation.
 
-See [Geo current limitations](../../gitlab-geo/README.md#current-limitations)
+See [Geo current limitations](../replication/index.md#current-limitations)
 for more information.
 
 ## Promoting secondary Geo replica in single-secondary configuration
@@ -150,7 +150,7 @@ Promoting a secondary to primary using the process above does not enable
 Geo on the new primary.
 
 To bring a new secondary online, follow the
-[Geo setup instructions](../../gitlab-geo/README.md#setup-instructions).
+[Geo setup instructions](../replication/index.md#setup-instructions).
 
 ## Promoting secondary Geo replica in multi-secondary configurations
 
@@ -171,6 +171,6 @@ after a fail-over.
 
 If you still have access to the old primary node, you can follow the
 instructions in the
-[Upgrading to GitLab 10.5](../../gitlab-geo/updating_the_geo_nodes.md#upgrading-to-gitlab-105)
+[Upgrading to GitLab 10.5](../replication/updating_the_geo_nodes.md#upgrading-to-gitlab-105)
 section to resolve the error. Otherwise, the secret is lost and you'll need to
-[reset two-factor authentication for all users](../../security/two_factor_authentication.md#disabling-2fa-for-everyone).
+[reset two-factor authentication for all users](../../../security/two_factor_authentication.md#disabling-2fa-for-everyone).

doc/administration/geo/replication/configuration.md

@@ -90,7 +90,7 @@ with the same credentials as used in the primary.
 GitLab integrates with the system-installed SSH daemon, designating a user
 (typically named git) through which all access requests are handled.
 
-In a [Disaster Recovery](../../disaster_recovery/index.md) situation, GitLab system
+In a [Disaster Recovery](../disaster_recovery/index.md) situation, GitLab system
 administrators will promote a secondary Geo replica to a primary and they can
 update the DNS records for the primary domain to point to the secondary to prevent
 the need to update all references to the primary domain to the secondary domain,

doc/administration/geo/replication/faq.md

@@ -5,7 +5,7 @@
 Yes, but there are limitations to what we replicate (see
 [What data is replicated to a secondary node?](#what-data-is-replicated-to-a-secondary-node)).
 
-Read the documentation for [Disaster Recovery](../../disaster_recovery/index.md).
+Read the documentation for [Disaster Recovery](../disaster_recovery/index.md).
 
 ## What data is replicated to a secondary node?
 

doc/administration/geo/replication/index.md

@@ -52,8 +52,8 @@ improving speed for distributed teams
 - Helps reducing the loading time for automated tasks,
 custom integrations and internal workflows
 - Quickly fail-over to a Geo secondary in a
-[Disaster Recovery](../../disaster_recovery/index.md) scenario
-- Allows [planned fail-over](../../disaster_recovery/planned_fail_over.md) to a Geo secondary
+[Disaster Recovery](../disaster_recovery/index.md) scenario
+- Allows [planned fail-over](../disaster_recovery/planned_fail_over.md) to a Geo secondary
 
 ## Architecture
 

doc/administration/index.md

@@ -20,8 +20,8 @@ Learn how to install, configure, update, and maintain your GitLab instance.
   - **(Starter/Premium)** [Omnibus support for log forwarding](https://docs.gitlab.com/omnibus/settings/logs.html#udp-log-shipping-gitlab-enterprise-edition-only)
 - [High Availability](high_availability/README.md): Configure multiple servers for scaling or high availability.
   - [High Availability on AWS](../university/high-availability/aws/README.md): Set up GitLab HA on Amazon AWS.
-- **(Premium)** [Geo](../gitlab-geo/README.md): Replicate your GitLab instance to other geographical locations as a read-only fully operational version.
-- **(Premium)** [Disaster Recovery](disaster_recovery/index.md): Quickly fail-over to a different site with minimal effort in a disaster situation.
+- **(Premium)** [Geo](geo/replication/index.md): Replicate your GitLab instance to other geographical locations as a read-only fully operational version.
+- **(Premium)** [Disaster Recovery](geo/disaster_recovery/index.md): Quickly fail-over to a different site with minimal effort in a disaster situation.
 - **(Premium)** [Pivotal Tile](../install/pivotal/index.md): Deploy GitLab as a pre-configured appliance using Ops Manager (BOSH) for Pivotal Cloud Foundry.
 
 ### Configuring GitLab

doc/gitlab-geo/bring-primary-back.md

-This document was moved to [another location](../administration/disaster_recovery/bring_primary_back.md).
+This document was moved to [another location](../administration/geo/disaster_recovery/bring_primary_back.md).

doc/gitlab-geo/disaster-recovery.md

-This document was moved to [another location](../administration/disaster_recovery/index.md).
+This document was moved to [another location](../administration/geo/disaster_recovery/index.md).

doc/gitlab-geo/planned-failover.md

-This document was moved to [another location](../administration/disaster_recovery/planned_fail_over.md).
+This document was moved to [another location](../administration/geo/disaster_recovery/planned_fail_over.md).