Commit 66c01861 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Few documentation improvements from last demo session

parent 0c8c4636
# Geo configuration # Geo configuration (omnibus)
>**Note:** >**Note:**
This is the documentation for the Omnibus GitLab packages. For installations This is the documentation for the Omnibus GitLab packages. For installations
...@@ -73,6 +73,7 @@ they must be manually replicated to the secondary. ...@@ -73,6 +73,7 @@ they must be manually replicated to the secondary.
``` ```
gitlab-ctl reconfigure gitlab-ctl reconfigure
gitlab-ctl restart
``` ```
### Step 2. Manually replicate primary SSH host keys ### Step 2. Manually replicate primary SSH host keys
...@@ -146,20 +147,20 @@ keys must be manually replicated to the secondary node. ...@@ -146,20 +147,20 @@ keys must be manually replicated to the secondary node.
1. Click the **Add node** button. 1. Click the **Add node** button.
1. SSH into your GitLab **secondary** server and restart the services: 1. SSH into your GitLab **secondary** server and restart the services:
``` ```bash
gitlab-ctl restart gitlab-ctl restart
``` ```
Check if there are any common issue with your Geo setup by running: Check if there are any common issue with your Geo setup by running:
``` ```bash
gitlab-rake gitlab:geo:check gitlab-rake gitlab:geo:check
``` ```
1. SSH into your GitLab **primary** server and login as root to verify the 1. SSH into your GitLab **primary** server and login as root to verify the
secondary is reachable or there are any common issue with your Geo setup: secondary is reachable or there are any common issue with your Geo setup:
``` ```bash
gitlab-rake gitlab:geo:check gitlab-rake gitlab:geo:check
``` ```
......
# Geo configuration # Geo configuration (source)
>**Note:** >**Note:**
This is the documentation for installations from source. For installations This is the documentation for installations from source. For installations
......
# Geo database replication # Geo database replication (omnibus)
>**Note:** >**Note:**
This is the documentation for the Omnibus GitLab packages. For installations This is the documentation for the Omnibus GitLab packages. For installations
...@@ -165,9 +165,10 @@ The following guide assumes that: ...@@ -165,9 +165,10 @@ The following guide assumes that:
## ##
# Secondary addresses # Secondary addresses
# - replace '1.2.3.4' with the primary public or VPC address
# - replace '5.6.7.8' with the secondary public or VPC address # - replace '5.6.7.8' with the secondary public or VPC address
## ##
postgresql['md5_auth_cidr_addresses'] = ['5.6.7.8/32'] postgresql['md5_auth_cidr_addresses'] = ['1.2.3.4/32','5.6.7.8/32']
## ##
## Replication settings ## Replication settings
......
# Geo database replication # Geo database replication (source)
>**Note:** >**Note:**
This is the documentation for installations from source. For installations This is the documentation for installations from source. For installations
......
# Geo # Geo (development)
Geo feature requires that we orchestrate a lot of components together. Geo feature requires that we orchestrate a lot of components together.
For the Database we need to setup a streaming replication. Any operation on disk For the Database we need to setup a streaming replication. Any operation on disk
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment