Commit 6c6f451d authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch '2179-geo-docs' into 'master'

Remove redundant documented steps for Geo Setup

Closes #2179

See merge request !1737
parents c75f2792 5487dc83
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
> **Notes:** > **Notes:**
- GitLab Geo is part of [GitLab Enterprise Edition Premium][ee]. - GitLab Geo is part of [GitLab Enterprise Edition Premium][ee].
- Introduced in GitLab Enterprise Edition 8.9. - Introduced in GitLab Enterprise Edition 8.9.
We recommend you use it with at least GitLab Enterprise Edition 8.14. We recommend you use it with at least GitLab Enterprise Edition 8.14 for
basic Geo features, or latest version for a better experience.
- You should make sure that all nodes run the same GitLab version. - You should make sure that all nodes run the same GitLab version.
GitLab Geo allows you to replicate your GitLab instance to other geographical GitLab Geo allows you to replicate your GitLab instance to other geographical
......
...@@ -137,18 +137,6 @@ sensitive data in the database. Any secondary node must have the ...@@ -137,18 +137,6 @@ sensitive data in the database. Any secondary node must have the
sudo -i sudo -i
``` ```
1. Edit `/etc/gitlab/gitlab.rb`:
```
geo_postgresql['enable'] = true
```
1. Reconfigure GitLab:
```
sudo gitlab-ctl reconfigure
```
1. Get the contents of `id_rsa.pub` key that was pre-generated by Omnibus GitLab 1. Get the contents of `id_rsa.pub` key that was pre-generated by Omnibus GitLab
and copy them: and copy them:
......
...@@ -171,6 +171,7 @@ The following guide assumes that: ...@@ -171,6 +171,7 @@ The following guide assumes that:
```ruby ```ruby
geo_secondary_role['enable'] = true geo_secondary_role['enable'] = true
geo_postgresql['enable'] = true
``` ```
1. [Reconfigure GitLab][] for the changes to take effect. 1. [Reconfigure GitLab][] for the changes to take effect.
......
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