Commit 5b2bceec authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Copyedit Geo docs

parent 7bb01ed9
......@@ -65,7 +65,6 @@ logins opened on all nodes as we will be moving back and forth.
1. Execute the command below to define the node as primary Geo node:
```
# Omnibus GitLab installations
gitlab-ctl set-geo-primary-node
```
......@@ -94,7 +93,6 @@ logins opened on all nodes as we will be moving back and forth.
1. Verify that the fingerprint was added by checking `known_hosts`:
```
# Omnibus GitLab installations
cat /var/opt/gitlab/.ssh/known_hosts
```
......@@ -113,7 +111,6 @@ sensitive data in the database. Any secondary node must have the
1. Execute the command below to display current encryption key and copy it:
```
# Omnibus GitLab installations
gitlab-rake geo:db:show_encryption_key
```
......@@ -127,7 +124,6 @@ sensitive data in the database. Any secondary node must have the
previous step:
```
# Omnibus GitLab installations
editor /etc/gitlab/gitlab-secrets.json
```
......@@ -153,10 +149,10 @@ sensitive data in the database. Any secondary node must have the
sudo gitlab-ctl reconfigure
```
1. Get the contents of `id_rsa.pub` key that was pre-generated by the Omnibus GitLab:
1. Get the contents of `id_rsa.pub` key that was pre-generated by Omnibus GitLab
and copy them:
```
# Omnibus installations
sudo -u git cat /var/opt/gitlab/.ssh/id_rsa.pub
```
......
......@@ -75,7 +75,6 @@ logins opened on all nodes as we will be moving back and forth.
1. Get the contents of `id_rsa.pub` for the git user:
```
# Installations from source
sudo -u git cat /home/git/.ssh/id_rsa.pub
```
......@@ -111,7 +110,6 @@ logins opened on all nodes as we will be moving back and forth.
1. Verify that the fingerprint was added by checking `known_hosts`:
```
# Installations from source
cat /home/git/.ssh/known_hosts
```
......@@ -127,10 +125,9 @@ sensitive data in the database. Any secondary node must have the
sudo -i
```
1. Execute the command below to display current encryption key and copy it:
1. Execute the command below to display the current encryption key and copy it:
```
# Installations from source
bundle exec rake geo:db:show_encryption_key
```
......@@ -184,7 +181,6 @@ sensitive data in the database. Any secondary node must have the
previous step:
```
# Installations from source
editor /home/git/gitlab/config/secrets.yml
```
......@@ -210,7 +206,6 @@ sensitive data in the database. Any secondary node must have the
1. Get the contents of `id_rsa.pub` the was just created:
```
# Installations from source
sudo -u git cat /home/git/.ssh/id_rsa.pub
```
......
......@@ -108,8 +108,8 @@ The following guide assumes that:
```
You may also want to edit the `wal_keep_segments` and `max_wal_senders` to
match your database replication requirements.
See [PostgreSQL - Replication documentation](https://www.postgresql.org/docs/9.6/static/runtime-config-replication.html)
match your database replication requirements. Consult the [PostgreSQL - Replication documentation](https://www.postgresql.org/docs/9.6/static/runtime-config-replication.html)
for more information.
1. Check to make sure your firewall rules are set so that the secondary nodes
can access port 5432 on the primary node.
......@@ -176,12 +176,10 @@ data before running `pg_basebackup`.
```
gitlab-ctl replicate-geo-database --host=1.2.3.4
```
Change the `--host=` to the primary node IP or FQDN. You can check other possible
params with `--help`. `
When prompted, enter the password you set up for the `gitlab_replicator`
user in the first step.
parameters with `--help`. When prompted, enter the password you set up for
the `gitlab_replicator` user in the first step.
The replication process is now over.
......
......@@ -75,7 +75,8 @@ The following guide assumes that:
See the Omnibus notes above for more details of `listen_address`.
You may also want to edit the `wal_keep_segments` and `max_wal_senders` to
match your database replication requirements.
match your database replication requirements. Consult the [PostgreSQL - Replication documentation](https://www.postgresql.org/docs/9.6/static/runtime-config-replication.html)
for more information.
1. Set the access control on the primary to allow TCP connections using the
server's public IP and set the connection from the secondary to require a
......
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