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
29efd392
Commit
29efd392
authored
Mar 22, 2017
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix database instructions for Geo
parent
a56366a8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
1 deletion
+21
-1
doc/gitlab-geo/configuration.md
doc/gitlab-geo/configuration.md
+21
-1
No files found.
doc/gitlab-geo/configuration.md
View file @
29efd392
...
@@ -46,6 +46,9 @@ first two steps of the [Setup instructions](README.md#setup-instructions):
...
@@ -46,6 +46,9 @@ first two steps of the [Setup instructions](README.md#setup-instructions):
1. You have set up the database replication.
1. You have set up the database replication.
1. Your secondary node is allowed to communicate via HTTP/HTTPS and SSH with
1. Your secondary node is allowed to communicate via HTTP/HTTPS and SSH with
your primary node (make sure your firewall is not blocking that).
your primary node (make sure your firewall is not blocking that).
1. You nodes must have a NTP service running to synchronize the clocks.
You can use different timezones, but the hour relative to UTC can't be more
than 60 seconds off from each node.
Some of the following steps require to configure the primary and secondary
Some of the following steps require to configure the primary and secondary
nodes almost at the same time. For your convenience make sure you have SSH
nodes almost at the same time. For your convenience make sure you have SSH
...
@@ -150,7 +153,6 @@ sensitive data in the database. Any secondary node must have the
...
@@ -150,7 +153,6 @@ sensitive data in the database. Any secondary node must have the
1. Edit the /etc/gitlab/gitlab.rb:
1. Edit the /etc/gitlab/gitlab.rb:
```
```
geo_secondary_role['enable'] = true
geo_postgresql['enable'] = true
geo_postgresql['enable'] = true
```
```
...
@@ -163,6 +165,24 @@ sensitive data in the database. Any secondary node must have the
...
@@ -163,6 +165,24 @@ sensitive data in the database. Any secondary node must have the
sudo cp /opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml.postgresql /opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml
sudo cp /opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml.postgresql /opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml
```
```
1. Edit the content of `
database_geo.yml
` in `
production:
` like the example below:
```yaml
#
# PRODUCTION
#
production:
adapter: postgresql
encoding: unicode
database: gitlabhq_geo_production
pool: 10
username: gitlab_geo
# password:
host: /var/opt/gitlab/geo-postgresql
port: 5431
```
1. Reconfigure GitLab:
1. Reconfigure GitLab:
```
```
...
...
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