Commit 195ee821 authored by Stan Hu's avatar Stan Hu

Merge branch 'da-geo-replicate-ssh-keys-docs' into 'master'

Resolve "Geo docs: Second SSH restart only considers ‘ssh’ not ‘sshd’"

Closes #5263

See merge request gitlab-org/gitlab-ee!4990
parents 47161b7d c51b9d6f
...@@ -29,7 +29,7 @@ in your testing/production environment. ...@@ -29,7 +29,7 @@ in your testing/production environment.
GitLab stores a number of secret values in the `/etc/gitlab/gitlab-secrets.json` GitLab stores a number of secret values in the `/etc/gitlab/gitlab-secrets.json`
file which *must* match between the primary and secondary nodes. Until there is file which *must* match between the primary and secondary nodes. Until there is
a means of automatically replicating these between nodes (see issue [gitlab-org/gitlab-ee#3789]), a means of automatically replicating these between nodes (see issue [gitlab-org/gitlab-ee#3789]),
they must be manually replicated to the secondary. they must be manually replicated to the secondary.
1. SSH into the **primary** node, and execute the command below: 1. SSH into the **primary** node, and execute the command below:
...@@ -127,7 +127,11 @@ keys must be manually replicated to the secondary node. ...@@ -127,7 +127,11 @@ keys must be manually replicated to the secondary node.
1. Restart sshd: 1. Restart sshd:
```bash ```bash
service ssh restart # Debian or Ubuntu installations
sudo service ssh reload
# CentOS installations
sudo service sshd reload
``` ```
### Step 3. Add the secondary GitLab node ### Step 3. Add the secondary GitLab node
...@@ -145,13 +149,13 @@ keys must be manually replicated to the secondary node. ...@@ -145,13 +149,13 @@ keys must be manually replicated to the secondary node.
``` ```
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:
``` ```
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:
...@@ -164,13 +168,13 @@ replicating missing data from the primary in a process known as **backfill**. ...@@ -164,13 +168,13 @@ replicating missing data from the primary in a process known as **backfill**.
Meanwhile, the primary node will start to notify the secondary of any changes, so Meanwhile, the primary node will start to notify the secondary of any changes, so
that the secondary can act on those notifications immediately. that the secondary can act on those notifications immediately.
Make sure the secondary instance is running and accessible. Make sure the secondary instance is running and accessible.
You can login to the secondary node with the same credentials as used in the primary. You can login to the secondary node with the same credentials as used in the primary.
### Step 4. (Optional) Enabling hashed storage (from GitLab 10.0) ### Step 4. (Optional) Enabling hashed storage (from GitLab 10.0)
CAUTION: **Warning**: CAUTION: **Warning**:
Hashed storage is in **Beta**. It is not considered production-ready. See Hashed storage is in **Beta**. It is not considered production-ready. See
[Hashed Storage] for more detail, and for the latest updates, check [Hashed Storage] for more detail, and for the latest updates, check
infrastructure issue [gitlab-com/infrastructure#2821]. infrastructure issue [gitlab-com/infrastructure#2821].
......
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