Fix the markdown spacing in geo docsdocs-geo-markdown

2 files changed, 158 insertions, 161 deletions

diff --git a/doc/administration/geo/replication/configuration.md b/doc/administration/geo/replication/configuration.md
index 3d4f69d3abe..0d29975aa29 100644
--- a/doc/administration/geo/replication/configuration.md
+++ b/doc/administration/geo/replication/configuration.md
@@ -17,7 +17,7 @@ You are encouraged to first read through all the steps before executing them
 in your testing/production environment.
 
 > **Notes:**
-> - **Do not** setup any custom authentication for the **secondary** nodes. This will be
+> - **Do not** set up any custom authentication for the **secondary** nodes. This will be
   handled by the **primary** node.
 > - Any change that requires access to the **Admin Area** needs to be done in the
   **primary** node because the **secondary** node is a read-only replica.
@@ -31,11 +31,11 @@ they must be manually replicated to the **secondary** node.
 
 1. SSH into the **primary** node, and execute the command below:
 
-    ```sh
-    sudo cat /etc/gitlab/gitlab-secrets.json
-    ```
+   ```sh
+   sudo cat /etc/gitlab/gitlab-secrets.json
+   ```
 
-    This will display the secrets that need to be replicated, in JSON format.
+   This will display the secrets that need to be replicated, in JSON format.
 
 1. SSH into the **secondary** node and login as the `root` user:
 
diff --git a/doc/administration/geo/replication/updating_the_geo_nodes.md b/doc/administration/geo/replication/updating_the_geo_nodes.md
index 933a75c47d8..348b0e9e7e5 100644
--- a/doc/administration/geo/replication/updating_the_geo_nodes.md
+++ b/doc/administration/geo/replication/updating_the_geo_nodes.md
@@ -32,68 +32,68 @@ authentication method.
 
 1. **[primary]** Login to your **primary** node and run:
 
-    ```sh
-    gitlab-ctl pg-password-md5 gitlab
-    # Enter password: <your_password_here>
-    # Confirm password: <your_password_here>
-    # fca0b89a972d69f00eb3ec98a5838484
-    ```
+   ```sh
+   gitlab-ctl pg-password-md5 gitlab
+   # Enter password: <your_password_here>
+   # Confirm password: <your_password_here>
+   # fca0b89a972d69f00eb3ec98a5838484
+   ```
 
-    Copy the generated hash and edit `/etc/gitlab/gitlab.rb`:
+   Copy the generated hash and edit `/etc/gitlab/gitlab.rb`:
 
-    ```ruby
-    # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab`
-    postgresql['sql_user_password'] = '<md5_hash_of_your_password>'
+   ```ruby
+   # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab`
+   postgresql['sql_user_password'] = '<md5_hash_of_your_password>'
 
-    # Every node that runs Unicorn or Sidekiq needs to have the database
-    # password specified as below. If you have a high-availability setup, this
-    # must be present in all application nodes.
-    gitlab_rails['db_password'] = '<your_password_here>'
-    ```
+   # Every node that runs Unicorn or Sidekiq needs to have the database
+   # password specified as below. If you have a high-availability setup, this
+   # must be present in all application nodes.
+   gitlab_rails['db_password'] = '<your_password_here>'
+   ```
 
-    Still in the configuration file, locate and remove the `trust_auth_cidr_address`:
+   Still in the configuration file, locate and remove the `trust_auth_cidr_address`:
 
-    ```ruby
-    postgresql['trust_auth_cidr_addresses'] = ['127.0.0.1/32','1.2.3.4/32'] # <- Remove this
-    ```
+   ```ruby
+   postgresql['trust_auth_cidr_addresses'] = ['127.0.0.1/32','1.2.3.4/32'] # <- Remove this
+   ```
 
 1. **[primary]** Reconfigure and restart:
 
-    ```sh
-    sudo gitlab-ctl reconfigure
-    sudo gitlab-ctl restart
-    ```
+   ```sh
+   sudo gitlab-ctl reconfigure
+   sudo gitlab-ctl restart
+   ```
 
 1. **[secondary]** Login to all **secondary** nodes and edit `/etc/gitlab/gitlab.rb`:
 
-    ```ruby
-    # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab`
-    postgresql['sql_user_password'] = '<md5_hash_of_your_password>'
+   ```ruby
+   # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab`
+   postgresql['sql_user_password'] = '<md5_hash_of_your_password>'
 
-    # Every node that runs Unicorn or Sidekiq needs to have the database
-    # password specified as below. If you have a high-availability setup, this
-    # must be present in all application nodes.
-    gitlab_rails['db_password'] = '<your_password_here>'
+   # Every node that runs Unicorn or Sidekiq needs to have the database
+   # password specified as below. If you have a high-availability setup, this
+   # must be present in all application nodes.
+   gitlab_rails['db_password'] = '<your_password_here>'
 
-    # Enable Foreign Data Wrapper
-    geo_secondary['db_fdw'] = true
+   # Enable Foreign Data Wrapper
+   geo_secondary['db_fdw'] = true
 
-    # Secondary address in CIDR format, for example '5.6.7.8/32'
-    postgresql['md5_auth_cidr_addresses'] = ['<secondary_node_ip>/32']
-    ```
+   # Secondary address in CIDR format, for example '5.6.7.8/32'
+   postgresql['md5_auth_cidr_addresses'] = ['<secondary_node_ip>/32']
+   ```
 
-    Still in the configuration file, locate and remove the `trust_auth_cidr_address`:
+   Still in the configuration file, locate and remove the `trust_auth_cidr_address`:
 
-    ```ruby
-    postgresql['trust_auth_cidr_addresses'] = ['127.0.0.1/32','5.6.7.8/32'] # <- Remove this
-    ```
+   ```ruby
+   postgresql['trust_auth_cidr_addresses'] = ['127.0.0.1/32','5.6.7.8/32'] # <- Remove this
+   ```
 
 1. **[secondary]** Reconfigure and restart:
 
-    ```sh
-    sudo gitlab-ctl reconfigure
-    sudo gitlab-ctl restart
-    ```
+   ```sh
+   sudo gitlab-ctl reconfigure
+   sudo gitlab-ctl restart
+   ```
 
 ## Upgrading to GitLab 10.5
 
@@ -171,9 +171,9 @@ the now-unused SSH keys from your secondaries, as they may cause problems if the
 
 1. **[secondary]** Login to **all** your **secondary** nodes and run:
 
-    ```ruby
-    sudo -u git -H rm ~git/.ssh/id_rsa ~git/.ssh/id_rsa.pub
-    ```
+   ```ruby
+   sudo -u git -H rm ~git/.ssh/id_rsa ~git/.ssh/id_rsa.pub
+   ```
 
 ### Hashed Storage
 
@@ -236,12 +236,12 @@ instructions below.
 When in doubt, it does not hurt to do a resync. The easiest way to do this in
 Omnibus is the following:
 
-  1. Make sure you have Omnibus GitLab on the **primary** server.
-  1. Run `gitlab-ctl reconfigure` and `gitlab-ctl restart postgresql`. This will enable replication slots on the **primary** database.
-  1. Check the steps about defining `postgresql['sql_user_password']`, `gitlab_rails['db_password']`.
-  1. Make sure `postgresql['max_replication_slots']` matches the number of **secondary** Geo nodes locations.
-  1. Install GitLab on the **secondary** server.
-  1. Re-run the [database replication process][database-replication].
+1. Make sure you have Omnibus GitLab on the **primary** server.
+1. Run `gitlab-ctl reconfigure` and `gitlab-ctl restart postgresql`. This will enable replication slots on the **primary** database.
+1. Check the steps about defining `postgresql['sql_user_password']`, `gitlab_rails['db_password']`.
+1. Make sure `postgresql['max_replication_slots']` matches the number of **secondary** Geo nodes locations.
+1. Install GitLab on the **secondary** server.
+1. Re-run the [database replication process][database-replication].
 
 ## Special update notes for 9.0.x
 
@@ -262,16 +262,16 @@ is prepended with the relevant node for better clarity:
 
 1. **[secondary]** Login to **all** your **secondary** nodes and stop all services:
 
-    ```ruby
-    sudo gitlab-ctl stop
-    ```
+   ```ruby
+   sudo gitlab-ctl stop
+   ```
 
 1. **[secondary]** Make a backup of the `recovery.conf` file on **all**
    **secondary** nodes to preserve PostgreSQL's credentials:
 
-    ```sh
-    sudo cp /var/opt/gitlab/postgresql/data/recovery.conf /var/opt/gitlab/
-    ```
+   ```sh
+   sudo cp /var/opt/gitlab/postgresql/data/recovery.conf /var/opt/gitlab/
+   ```
 
 1. **[primary]** Update the **primary** node to GitLab 9.0 following the
    [regular update docs][update]. At the end of the update, the **primary** node
@@ -281,136 +281,133 @@ is prepended with the relevant node for better clarity:
    stop all services except `postgresql` as we will use it to re-initialize the
    **secondary** node's database:
 
-    ```sh
-    sudo gitlab-ctl stop
-    sudo gitlab-ctl start postgresql
-    ```
+   ```sh
+   sudo gitlab-ctl stop
+   sudo gitlab-ctl start postgresql
+   ```
 
 1. **[secondary]** Run the following steps on each of the **secondary** nodes:
 
-    1. **[secondary]**  Stop all services:
+   1. **[secondary]**  Stop all services:
 
-        ```sh
-        sudo gitlab-ctl stop
-        ```
+      ```sh
+      sudo gitlab-ctl stop
+      ```
 
-    1. **[secondary]** Prevent running database migrations:
+   1. **[secondary]** Prevent running database migrations:
 
-        ```sh
-        sudo touch /etc/gitlab/skip-auto-migrations
-        ```
+      ```sh
+      sudo touch /etc/gitlab/skip-auto-migrations
+      ```
 
-    1. **[secondary]** Move the old database to another directory:
+   1. **[secondary]** Move the old database to another directory:
 
-        ```sh
-        sudo mv /var/opt/gitlab/postgresql{,.bak}
-        ```
+      ```sh
+      sudo mv /var/opt/gitlab/postgresql{,.bak}
+      ```
 
-    1. **[secondary]** Update to GitLab 9.0 following the [regular update docs][update].
-       At the end of the update, the node will be running with PostgreSQL 9.6.
+   1. **[secondary]** Update to GitLab 9.0 following the [regular update docs][update].
+      At the end of the update, the node will be running with PostgreSQL 9.6.
 
-    1. **[secondary]** Make sure all services are up:
+   1. **[secondary]** Make sure all services are up:
 
-        ```sh
-        sudo gitlab-ctl start
-        ```
+      ```sh
+      sudo gitlab-ctl start
+      ```
 
-    1. **[secondary]** Reconfigure GitLab:
+   1. **[secondary]** Reconfigure GitLab:
 
-        ```sh
-        sudo gitlab-ctl reconfigure
-        ```
+      ```sh
+      sudo gitlab-ctl reconfigure
+      ```
 
-    1. **[secondary]** Run the PostgreSQL upgrade command:
+   1. **[secondary]** Run the PostgreSQL upgrade command:
 
-        ```sh
-        sudo gitlab-ctl pg-upgrade
-        ```
+      ```sh
+      sudo gitlab-ctl pg-upgrade
+      ```
 
-    1. **[secondary]** See the stored credentials for the database that you will
-       need to re-initialize the replication:
+   1. **[secondary]** See the stored credentials for the database that you will
+      need to re-initialize the replication:
 
-        ```sh
-        sudo grep -s primary_conninfo /var/opt/gitlab/recovery.conf
-        ```
+      ```sh
+      sudo grep -s primary_conninfo /var/opt/gitlab/recovery.conf
+      ```
 
-    1. **[secondary]** Create the `replica.sh` script as described in the
-       [database configuration document][database-source-replication].
+   1. **[secondary]** Save the snippet below in a file, let's say `/tmp/replica.sh`. Modify the
+      embedded paths if necessary:
 
-    1. 1. **[secondary]** Save the snippet below in a file, let's say `/tmp/replica.sh`. Modify the
-       embedded paths if necessary:
+      ```
+      #!/bin/bash
 
-        ```
-        #!/bin/bash
+      PORT="5432"
+      USER="gitlab_replicator"
+      echo ---------------------------------------------------------------
+      echo WARNING: Make sure this script is run from the secondary server
+      echo ---------------------------------------------------------------
+      echo
+      echo Enter the IP or FQDN of the primary PostgreSQL server
+      read HOST
+      echo Enter the password for $USER@$HOST
+      read -s PASSWORD
+      echo Enter the required sslmode
+      read SSLMODE
 
-        PORT="5432"
-        USER="gitlab_replicator"
-        echo ---------------------------------------------------------------
-        echo WARNING: Make sure this script is run from the secondary server
-        echo ---------------------------------------------------------------
-        echo
-        echo Enter the IP or FQDN of the primary PostgreSQL server
-        read HOST
-        echo Enter the password for $USER@$HOST
-        read -s PASSWORD
-        echo Enter the required sslmode
-        read SSLMODE
+      echo Stopping PostgreSQL and all GitLab services
+      sudo service gitlab stop
+      sudo service postgresql stop
 
-        echo Stopping PostgreSQL and all GitLab services
-        sudo service gitlab stop
-        sudo service postgresql stop
+      echo Backing up postgresql.conf
+      sudo -u postgres mv /var/opt/gitlab/postgresql/data/postgresql.conf /var/opt/gitlab/postgresql/
 
-        echo Backing up postgresql.conf
-        sudo -u postgres mv /var/opt/gitlab/postgresql/data/postgresql.conf /var/opt/gitlab/postgresql/
+      echo Cleaning up old cluster directory
+      sudo -u postgres rm -rf /var/opt/gitlab/postgresql/data
 
-        echo Cleaning up old cluster directory
-        sudo -u postgres rm -rf /var/opt/gitlab/postgresql/data
+      echo Starting base backup as the replicator user
+      echo Enter the password for $USER@$HOST
+      sudo -u postgres /opt/gitlab/embedded/bin/pg_basebackup -h $HOST -D /var/opt/gitlab/postgresql/data -U gitlab_replicator -v -x -P
 
-        echo Starting base backup as the replicator user
-        echo Enter the password for $USER@$HOST
-        sudo -u postgres /opt/gitlab/embedded/bin/pg_basebackup -h $HOST -D /var/opt/gitlab/postgresql/data -U gitlab_replicator -v -x -P
+      echo Writing recovery.conf file
+      sudo -u postgres bash -c "cat > /var/opt/gitlab/postgresql/data/recovery.conf <<- _EOF1_
+        standby_mode = 'on'
+        primary_conninfo = 'host=$HOST port=$PORT user=$USER password=$PASSWORD sslmode=$SSLMODE'
+      _EOF1_
+      "
 
-        echo Writing recovery.conf file
-        sudo -u postgres bash -c "cat > /var/opt/gitlab/postgresql/data/recovery.conf <<- _EOF1_
-          standby_mode = 'on'
-          primary_conninfo = 'host=$HOST port=$PORT user=$USER password=$PASSWORD sslmode=$SSLMODE'
-        _EOF1_
-        "
+      echo Restoring postgresql.conf
+      sudo -u postgres mv /var/opt/gitlab/postgresql/postgresql.conf /var/opt/gitlab/postgresql/data/
 
-        echo Restoring postgresql.conf
-        sudo -u postgres mv /var/opt/gitlab/postgresql/postgresql.conf /var/opt/gitlab/postgresql/data/
+      echo Starting PostgreSQL
+      sudo service postgresql start
+      ```
 
-        echo Starting PostgreSQL
-        sudo service postgresql start
-        ```
+   1. **[secondary]** Run the recovery script using the credentials from the
+      previous step:
 
-    1. **[secondary]** Run the recovery script using the credentials from the
-       previous step:
+      ```sh
+      sudo bash /tmp/replica.sh
+      ```
 
-        ```sh
-        sudo bash /tmp/replica.sh
-        ```
+   1. **[secondary]** Reconfigure GitLab:
 
-    1. **[secondary]** Reconfigure GitLab:
+      ```sh
+      sudo gitlab-ctl reconfigure
+      ```
 
-        ```sh
-        sudo gitlab-ctl reconfigure
-        ```
+   1. **[secondary]** Start all services:
 
-    1. **[secondary]** Start all services:
+      ```sh
+      sudo gitlab-ctl start
+      ```
 
-        ```sh
-        sudo gitlab-ctl start
-        ```
-
-    1. **[secondary]** Repeat the steps for the remaining **secondary** nodes.
+   1. **[secondary]** Repeat the steps for the remaining **secondary** nodes.
 
 1. **[primary]** After all **secondary** nodes are updated, start all services in
    **primary** node:
 
-    ```sh
-    sudo gitlab-ctl start
-    ```
+   ```sh
+   sudo gitlab-ctl start
+   ```
 
 ## Check status after updating
 
@@ -419,9 +416,9 @@ everything is working correctly:
 
 1. Run the Geo raketask on all nodes, everything should be green:
 
-    ```sh
-    sudo gitlab-rake gitlab:geo:check
-    ```
+   ```sh
+   sudo gitlab-rake gitlab:geo:check
+   ```
 
 1. Check the **primary** node's Geo dashboard for any errors.
 1. Test the data replication by pushing code to the **primary** node and see if it
@@ -435,9 +432,9 @@ and it is required since 10.0.
 
 1. Run database migrations on tracking database:
 
-    ```sh
-    sudo gitlab-rake geo:db:migrate
-    ```
+   ```sh
+   sudo gitlab-rake geo:db:migrate
+   ```
 
 1. Repeat this step for each **secondary** node.