Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
062d127c
Commit
062d127c
authored
Mar 13, 2018
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some more indentation issues, and add missing restart step
parent
66c01861
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
14 deletions
+20
-14
doc/administration/geo/replication/configuration_source.md
doc/administration/geo/replication/configuration_source.md
+10
-4
doc/administration/geo/replication/database.md
doc/administration/geo/replication/database.md
+10
-10
No files found.
doc/administration/geo/replication/configuration_source.md
View file @
062d127c
...
@@ -69,6 +69,12 @@ be manually replicated to the secondary.
...
@@ -69,6 +69,12 @@ be manually replicated to the secondary.
chown git:git /home/git/gitlab/config/secrets.yml
chown git:git /home/git/gitlab/config/secrets.yml
chmod 0600 /home/git/gitlab/config/secrets.yml
chmod 0600 /home/git/gitlab/config/secrets.yml
```
```
1.
Restart GitLab
```bash
service gitlab restart
```
Once restarted, the secondary will automatically start replicating missing data
Once restarted, the secondary will automatically start replicating missing data
from the primary in a process known as backfill. Meanwhile, the primary node
from the primary in a process known as backfill. Meanwhile, the primary node
...
@@ -98,11 +104,11 @@ Read [Manually replicate primary SSH host keys][configuration-replicate-ssh]
...
@@ -98,11 +104,11 @@ Read [Manually replicate primary SSH host keys][configuration-replicate-ssh]
service gitlab restart
service gitlab 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:
```
bash
```
bash
bundle
exec
rake gitlab:geo:check
bundle
exec
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:
...
...
doc/administration/geo/replication/database.md
View file @
062d127c
...
@@ -472,16 +472,16 @@ the instructions below:
...
@@ -472,16 +472,16 @@ the instructions below:
1.
Edit
`/etc/gitlab/gitlab.rb`
with the connection params and credentials
1.
Edit
`/etc/gitlab/gitlab.rb`
with the connection params and credentials
```
ruby
```ruby
# note this is shared between both databases,
# note this is shared between both databases,
# make sure you define the same password in both
# make sure you define the same password in both
gitlab_rails
[
'db_password'
]
=
'mypassword'
gitlab_rails['db_password'] = 'mypassword'
geo_secondary
[
'db_host'
]
=
'2.3.4.5'
# change to the correct public IP
geo_secondary['db_host'] = '2.3.4.5' # change to the correct public IP
geo_secondary
[
'db_port'
]
=
5431
# change to the correct port
geo_secondary['db_port'] = 5431 # change to the correct port
geo_secondary
[
'db_fdw'
]
=
true
# enable FDW
geo_secondary['db_fdw'] = true # enable FDW
geo_postgresql
[
'enable'
]
=
false
# don't use internal managed instance
geo_postgresql['enable'] = false # don't use internal managed instance
```
```
1.
Reconfigure GitLab for the changes to take effect:
1.
Reconfigure GitLab for the changes to take effect:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment