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
66c01861
Commit
66c01861
authored
Mar 13, 2018
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few documentation improvements from last demo session
parent
0c8c4636
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
14 deletions
+16
-14
doc/administration/geo/replication/configuration.md
doc/administration/geo/replication/configuration.md
+10
-9
doc/administration/geo/replication/configuration_source.md
doc/administration/geo/replication/configuration_source.md
+1
-1
doc/administration/geo/replication/database.md
doc/administration/geo/replication/database.md
+3
-2
doc/administration/geo/replication/database_source.md
doc/administration/geo/replication/database_source.md
+1
-1
doc/development/geo.md
doc/development/geo.md
+1
-1
No files found.
doc/administration/geo/replication/configuration.md
View file @
66c01861
# Geo configuration
# Geo configuration
(omnibus)
>**Note:**
This is the documentation for the Omnibus GitLab packages. For installations
...
...
@@ -73,6 +73,7 @@ they must be manually replicated to the secondary.
```
gitlab-ctl reconfigure
gitlab-ctl restart
```
### Step 2. Manually replicate primary SSH host keys
...
...
@@ -146,20 +147,20 @@ keys must be manually replicated to the secondary node.
1.
Click the
**Add node**
button.
1.
SSH into your GitLab
**secondary**
server and restart the services:
```
gitlab-ctl restart
```
```bash
gitlab-ctl 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:
```
gitlab-rake gitlab:geo:check
```
```bash
gitlab-rake gitlab:geo:check
```
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:
```
```
bash
gitlab-rake gitlab:geo:check
```
...
...
doc/administration/geo/replication/configuration_source.md
View file @
66c01861
# Geo configuration
# Geo configuration
(source)
>**Note:**
This is the documentation for installations from source. For installations
...
...
doc/administration/geo/replication/database.md
View file @
66c01861
# Geo database replication
# Geo database replication
(omnibus)
>**Note:**
This is the documentation for the Omnibus GitLab packages. For installations
...
...
@@ -165,9 +165,10 @@ The following guide assumes that:
##
# Secondary addresses
# - replace '1.2.3.4' with the primary public or VPC address
# - replace '5.6.7.8' with the secondary public or VPC address
##
postgresql['md5_auth_cidr_addresses'] = ['5.6.7.8/32']
postgresql['md5_auth_cidr_addresses'] = ['
1.2.3.4/32','
5.6.7.8/32']
##
## Replication settings
...
...
doc/administration/geo/replication/database_source.md
View file @
66c01861
# Geo database replication
# Geo database replication
(source)
>**Note:**
This is the documentation for installations from source. For installations
...
...
doc/development/geo.md
View file @
66c01861
# Geo
# Geo
(development)
Geo feature requires that we orchestrate a lot of components together.
For the Database we need to setup a streaming replication. Any operation on disk
...
...
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