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
0c496e4f
Commit
0c496e4f
authored
Dec 17, 2018
by
Evan Read
Committed by
Achilleas Pipinellis
Dec 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary warning and add other minor improvements
parent
fd12e57f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
27 deletions
+18
-27
doc/administration/geo/replication/configuration.md
doc/administration/geo/replication/configuration.md
+12
-19
doc/administration/geo/replication/configuration_source.md
doc/administration/geo/replication/configuration_source.md
+6
-8
doc/administration/geo/replication/img/hashed_storage.png
doc/administration/geo/replication/img/hashed_storage.png
+0
-0
No files found.
doc/administration/geo/replication/configuration.md
View file @
0c496e4f
...
...
@@ -113,7 +113,7 @@ keys must be manually replicated to the secondary node.
```
If you only have access through a user with **sudo** privileges:
```bash
# Run this from your primary node:
sudo tar --transform 's/.*\///g' -zcvf ~/geo-host-key.tar.gz /etc/ssh/ssh_host_*_key*
...
...
@@ -129,15 +129,15 @@ keys must be manually replicated to the secondary node.
chown root:root /etc/ssh/ssh_host_*_key*
chmod 0600 /etc/ssh/ssh_host_*_key*
```
1.
To verify key fingerprint matches, execute the following command on both nodes:
```bash
for file in /etc/ssh/ssh_host_*_key; do ssh-keygen -lf $file; done
```
You should get an output similar to this one and they should be identical on both nodes:
```bash
1024 SHA256:FEZX2jQa2bcsd/fn/uxBzxhKdx4Imc4raXrHwsbtP0M root@serverhostname (DSA)
256 SHA256:uw98R35Uf+fYEQ/UnJD9Br4NXUFPv7JAUln5uHlgSeY root@serverhostname (ECDSA)
...
...
@@ -150,14 +150,14 @@ keys must be manually replicated to the secondary node.
```bash
# This will print the fingerprint for private keys:
for file in /etc/ssh/ssh_host_*_key; do ssh-keygen -lf $file; done
# This will print the fingerprint for public keys:
for file in /etc/ssh/ssh_host_*_key.pub; do ssh-keygen -lf $file; done
```
NOTE: **Note**:
The output for private keys and public keys command should generate the same fingerprint.
1.
Restart sshd on your
**secondary**
node:
```bash
...
...
@@ -205,21 +205,14 @@ that the secondary can act on those notifications immediately.
Make sure the secondary instance is running and accessible.
You can login to the secondary node with the same credentials as used in the primary.
### Step 4. Enabling
hashed storage (from GitLab 10.0)
### Step 4. Enabling
Hashed Storage
CAUTION:
**Warning**
:
Hashed storage is in
**Beta**
. It is not considered production-ready. See
[Hashed Storage] for more detail, and for the latest updates, check
infrastructure issue [gitlab-com/infrastructure#2821].
Using hashed storage significantly improves Geo replication - project and group
Using Hashed Storage significantly improves Geo replication. Project and group
renames no longer require synchronization between nodes.
1.
Visit the
**primary**
node's
**Admin Area > Settings**
(
`/admin/application_settings`
) in your browser
1.
In the
`Repository Storages`
section, check
`Create new projects using hashed storage paths`
:
![](img/hashed_storage.png)
1.
Visit the
**primary**
node's
**Admin Area > Settings > Repository**
(
`/admin/application_settings/repository`
) in your browser.
1.
In the
**Repository storage**
section, check
**Use hashed storage paths for newly created and renamed projects**
.
### Step 5. (Optional) Configuring the secondary to trust the primary
...
...
doc/administration/geo/replication/configuration_source.md
View file @
0c496e4f
...
...
@@ -70,7 +70,7 @@ be manually replicated to the secondary.
chown git:git /home/git/gitlab/config/secrets.yml
chmod 0600 /home/git/gitlab/config/secrets.yml
```
1.
Restart GitLab
```bash
...
...
@@ -104,13 +104,13 @@ Read [Manually replicate primary SSH host keys][configuration-replicate-ssh]
```bash
service gitlab restart
```
Check if there are any common issue with your Geo setup by running:
```bash
bundle exec 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:
...
...
@@ -126,9 +126,9 @@ that the secondary can act on those notifications immediately.
Make sure the secondary instance is running and accessible.
You can login to the secondary node with the same credentials as used in the primary.
### Step 4. Enabling
hashed storage (from GitLab 10.0)
### Step 4. Enabling
Hashed Storage
Read
[
Enabling Hashed Storage
]
[
configuration-hashed-storage
]
Read
[
Enabling Hashed Storage
]
(
configuration.md##step-4-enabling-hashed-storage
)
.
### Step 5. (Optional) Configuring the secondary to trust the primary
...
...
@@ -157,7 +157,6 @@ method to be enabled. Navigate to **Admin Area > Settings**
Read
[
Verify proper functioning of the secondary node
][
configuration-verify-node
]
.
## Selective synchronization
Read
[
Selective synchronization
][
configuration-selective-replication
]
.
...
...
@@ -169,7 +168,6 @@ Read the [troubleshooting document][troubleshooting].
[
setup-geo-source
]:
index.md#using-gitlab-installed-from-source
[
gitlab-org/gitlab-ee#3789
]:
https://gitlab.com/gitlab-org/gitlab-ee/issues/3789
[
configuration
]:
configuration.md
[
configuration-hashed-storage
]:
configuration.md#step-4-optional-enabling-hashed-storage-from-gitlab-10-0
[
configuration-replicate-ssh
]:
configuration.md#step-2-manually-replicate-primary-ssh-host-keys
[
configuration-selective-replication
]:
configuration.md#selective-synchronization
[
configuration-verify-node
]:
configuration.md#step-7-verify-proper-functioning-of-the-secondary-node
...
...
doc/administration/geo/replication/img/hashed_storage.png
deleted
100644 → 0
View file @
fd12e57f
11.6 KB
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