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
883bb6de
Commit
883bb6de
authored
Mar 22, 2017
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add the Disaster Recovery info for source installations
[ci skip]
parent
31b18049
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
28 deletions
+33
-28
doc/gitlab-geo/configuration.md
doc/gitlab-geo/configuration.md
+5
-6
doc/gitlab-geo/configuration_source.md
doc/gitlab-geo/configuration_source.md
+28
-22
No files found.
doc/gitlab-geo/configuration.md
View file @
883bb6de
...
...
@@ -46,7 +46,7 @@ first two steps of the [Setup instructions](README.md#setup-instructions):
1. You have set up the database replication.
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).
1. You
nodes must have a
NTP service running to synchronize the clocks.
1. You
r nodes must have an
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.
...
...
@@ -151,7 +151,7 @@ sensitive data in the database. Any secondary node must have the
```
1. (This step is required only if you want to enable the new Disaster Recovery
feature in Alpha shipped in GitLab 9.0) Edit
the /etc/gitlab/gitlab.rb
:
feature in Alpha shipped in GitLab 9.0) Edit
`
/etc/gitlab/gitlab.rb
`
:
```
geo_postgresql['enable'] = true
...
...
@@ -169,7 +169,7 @@ sensitive data in the database. Any secondary node must have the
1. (This step is required only if you want to enable the new Disaster Recovery
feature in Alpha shipped in GitLab 9.0) Edit the content of
`
database_geo.yml
` in `
production:
`
like the example below
:
`
database_geo.yml
` in `
production:
`
to be like the following
:
```yaml
#
...
...
@@ -184,7 +184,6 @@ sensitive data in the database. Any secondary node must have the
# password:
host: /var/opt/gitlab/geo-postgresql
port: 5431
```
1. (This step is required only if you want to enable the new Disaster Recovery
...
...
doc/gitlab-geo/configuration_source.md
View file @
883bb6de
...
...
@@ -140,7 +140,9 @@ sensitive data in the database. Any secondary node must have the
sudo -i
```
1. Create `
database_geo.yml
` with the information of your secondary PostgreSQL database.
1. (This step is required only if you want to enable the new Disaster Recovery
feature in Alpha shipped in GitLab 9.0) Create `
database_geo.yml
` with the
information of your secondary PostgreSQL database.
Note that this must be a totally different instance from the primary, since this
is where the secondary will track its internal state:
...
...
@@ -148,7 +150,9 @@ sensitive data in the database. Any secondary node must have the
sudo cp /home/git/gitlab/config/database_geo.yml.postgresql /home/git/gitlab/config/database_geo.yml
```
1. Edit the content of `
database_geo.yml
` in `
production:
` like the example below:
1. (This step is required only if you want to enable the new Disaster Recovery
feature in Alpha shipped in GitLab 9.0) Edit the content of `
database_geo.yml
`
in `
production:
` to be like the following:
```yaml
#
...
...
@@ -163,12 +167,14 @@ sensitive data in the database. Any secondary node must have the
# password:
host: /var/opt/gitlab/geo-postgresql
port: 5431
```
1. Create the database `
gitlabhq_geo_production
` in that PostgreSQL instance.
1. (This step is required only if you want to enable the new Disaster Recovery
feature in Alpha shipped in GitLab 9.0) Create the database
`
gitlabhq_geo_production
` in that PostgreSQL instance.
1. Set up the Geo tracking database:
1. (This step is required only if you want to enable the new Disaster Recovery
feature in Alpha shipped in GitLab 9.0) Set up the Geo tracking database:
```
bundle exec rake geo:db:migrate
...
...
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