Commit 607955ad authored by James Lopez's avatar James Lopez

Merge branch 'sec-geo-promote-primary' into 'master'

Security: fix documentation for Geo replication

See merge request gitlab/gitlab-ee!586
parents f3df1df5 a9b9bfda
...@@ -336,7 +336,6 @@ data before running `pg_basebackup`. ...@@ -336,7 +336,6 @@ data before running `pg_basebackup`.
echo Cleaning up old cluster directory echo Cleaning up old cluster directory
sudo -u postgres rm -rf /var/opt/gitlab/postgresql/data sudo -u postgres rm -rf /var/opt/gitlab/postgresql/data
rm -f /tmp/postgresql.trigger
echo Starting base backup as the replicator user echo Starting base backup as the replicator user
echo Enter the password for $USER@$HOST echo Enter the password for $USER@$HOST
...@@ -346,7 +345,6 @@ data before running `pg_basebackup`. ...@@ -346,7 +345,6 @@ data before running `pg_basebackup`.
sudo -u postgres bash -c "cat > /var/opt/gitlab/postgresql/data/recovery.conf <<- _EOF1_ sudo -u postgres bash -c "cat > /var/opt/gitlab/postgresql/data/recovery.conf <<- _EOF1_
standby_mode = 'on' standby_mode = 'on'
primary_conninfo = 'host=$HOST port=$PORT user=$USER password=$PASSWORD sslmode=$SSLMODE' primary_conninfo = 'host=$HOST port=$PORT user=$USER password=$PASSWORD sslmode=$SSLMODE'
trigger_file = '/tmp/postgresql.trigger'
_EOF1_ _EOF1_
" "
......
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