Small fixes to Geo database configuration doc

doc/gitlab-geo/database.md

@@ -39,9 +39,9 @@ recover. See below for more details.
 
 The following guide assumes that:
 
-- You are using Omnibus and therefore you are using PostgreSQL 9.6 or later 
-  which includes the  [`pg_basebackup` tool][pgback] and improved 
-  [Foreign Data Wrapper][FDW] support. 
+- You are using Omnibus and therefore you are using PostgreSQL 9.6 or later
+  which includes the  [`pg_basebackup` tool][pgback] and improved
+  [Foreign Data Wrapper][FDW] support.
 - You have a primary node already set up (the GitLab server you are
   replicating from), running Omnibus' PostgreSQL (or equivalent version), and
   you have a new secondary server set up with the same versions of the OS,
@@ -67,22 +67,22 @@ The following guide assumes that:
     ```
 
     This command will use your defined `external_url` in `/etc/gitlab/gitlab.rb`.
-    
+
 1. GitLab 10.4 and up only: Do the following to make sure the `gitlab` database user has a password defined
 
     Generate a MD5 hash of the desired password:
-   
+
     ```bash
     gitlab-ctl pg-password-md5 gitlab
     # Enter password: mypassword
     # Confirm password: mypassword
     # fca0b89a972d69f00eb3ec98a5838484
     ```
-   
+
     Edit `/etc/gitlab/gitlab.rb`:
-   
+
     ```ruby
-    # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab` 
+    # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab`
     postgresql['sql_user_password'] = 'fca0b89a972d69f00eb3ec98a5838484'
 
     # If you have HA setup, this must be present in all nodes as well
@@ -308,19 +308,16 @@ because we have not yet configured the secondary server. This is the next step.
 
     This step is similar to how we configured the primary instance.
     We need to enable this, even if using a single node, to enable FDW support.
-    
+
     Edit `/etc/gitlab/gitlab.rb` and add the following, replacing the IP
     addresses with addresses appropriate to your network configuration:
-    
+
     ```ruby
-    geo_primary_role['enable'] = true
-    
     # Secondary addresses
-    # - replace '5.6.7.8' with the secondary public address
+    # - replace '5.6.7.8' with the secondary private address
     postgresql['listen_address'] = '5.6.7.8'
     postgresql['trust_auth_cidr_addresses'] = ['127.0.0.1/32','5.6.7.8/32']
-    postgresql['md5_auth_cidr_addresses'] = ['5.6.7.8/32']
-    
+
     # gitlab database user's password (defined previously)
     gitlab_rails['db_password'] = 'mypassword'
     ```
@@ -477,4 +474,5 @@ Read the [troubleshooting document](troubleshooting.md).
 [pgback]: http://www.postgresql.org/docs/9.2/static/app-pgbasebackup.html
 [external postgresql]: #external-postgresql-instances
 [tracking]: database_source.md#enable-tracking-database-on-the-secondary-server
+[FDW]: https://www.postgresql.org/docs/9.6/static/postgres-fdw.html
 [toc]: README.md#using-omnibus-gitlab