Commit 523723c9 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'add-precreate-dir-geo-doc' into 'master'

Add pre-create directory commands to geo doc for DB replication

See merge request gitlab-org/gitlab-ee!3588
parents 2e4297dd 6384e166
...@@ -19,6 +19,12 @@ those included with CentOS 6 as of September 2017. If you want to use this ...@@ -19,6 +19,12 @@ those included with CentOS 6 as of September 2017. If you want to use this
feature for CentOS 6, follow [the instructions on how to build and install a custom OpenSSH package] feature for CentOS 6, follow [the instructions on how to build and install a custom OpenSSH package]
(#compiling-a-custom-version-of-openssh-for-centos-6) before continuing. (#compiling-a-custom-version-of-openssh-for-centos-6) before continuing.
Create the directory `/opt/gitlab-shell` first:
```bash
sudo mkdir -p /opt/gitlab-shell
```
Create this file at `/opt/gitlab-shell/authorized_keys`: Create this file at `/opt/gitlab-shell/authorized_keys`:
``` ```
......
...@@ -315,10 +315,11 @@ primary before the database is replicated. ...@@ -315,10 +315,11 @@ primary before the database is replicated.
# Certificate and key currently used by GitLab # Certificate and key currently used by GitLab
mkdir -p ~gitlab-psql/.postgresql mkdir -p ~gitlab-psql/.postgresql
ln -s /opt/gitlab/embedded/ssl/certs/cacert.pem ~gitlab-psql/.postgresql/root.crt ln -s /opt/gitlab/embedded/ssl/certs/cacert.pem ~gitlab-psql/.postgresql/root.crt
```
```bash
# Self-signed certificate and key # Self-signed certificate and key
install -o gitlab-psql -g gitlab-psql -m 0400 -T server.crt ~gitlab-psql/.postgresql/root.crt install -o gitlab-psql -g gitlab-psql -m 0400 -T server.crt -D ~gitlab-psql/.postgresql/root.crt
``` ```
PostgreSQL will now only recognize that exact certificate when verifying TLS PostgreSQL will now only recognize that exact certificate when verifying TLS
...@@ -330,8 +331,9 @@ primary before the database is replicated. ...@@ -330,8 +331,9 @@ primary before the database is replicated.
``` ```
# Certificate and key currently used by GitLab, and connecting by FQDN # Certificate and key currently used by GitLab, and connecting by FQDN
sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h primary.geo.example.com -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-full" -W sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h primary.geo.example.com -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-full" -W
```
```
# Self-signed certificate and key, or connecting by IP address # Self-signed certificate and key, or connecting by IP address
sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h 1.2.3.4 -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h 1.2.3.4 -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W
``` ```
...@@ -407,7 +409,9 @@ data before running `pg_basebackup`. ...@@ -407,7 +409,9 @@ data before running `pg_basebackup`.
``` ```
# Certificate and key currently used by GitLab, and connecting by FQDN # Certificate and key currently used by GitLab, and connecting by FQDN
gitlab-ctl replicate-geo-database --host=primary.geo.example.com --slot-name=secondary_example gitlab-ctl replicate-geo-database --host=primary.geo.example.com --slot-name=secondary_example
```
```
# Self-signed certificate and key, or connecting by IP # Self-signed certificate and key, or connecting by IP
gitlab-ctl replicate-geo-database --host=1.2.3.4 --slot-name=secondary_example --sslmode=verify-ca gitlab-ctl replicate-geo-database --host=1.2.3.4 --slot-name=secondary_example --sslmode=verify-ca
``` ```
......
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