Commit 4d8c5880 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'update-geo-configuration-docs' into 'master'

Update GEO configuration docs to reflect new settings

See merge request gitlab-org/gitlab!47672
parents 00d3a4eb 44d36d47
...@@ -232,16 +232,7 @@ that the **secondary** node can act on those notifications immediately. ...@@ -232,16 +232,7 @@ that the **secondary** node can act on those notifications immediately.
Be sure the _secondary_ node is running and accessible. You can sign in to the Be sure the _secondary_ node is running and accessible. You can sign in to the
_secondary_ node with the same credentials as were used with the _primary_ node. _secondary_ node with the same credentials as were used with the _primary_ node.
### Step 4. Enabling Hashed Storage ### Step 4. (Optional) Configuring the **secondary** node to trust the **primary** node
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 > 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** node to trust the **primary** node
You can safely skip this step if your **primary** node uses a CA-issued HTTPS certificate. You can safely skip this step if your **primary** node uses a CA-issued HTTPS certificate.
...@@ -251,14 +242,16 @@ certificate from the **primary** node and follow ...@@ -251,14 +242,16 @@ certificate from the **primary** node and follow
[these instructions](https://docs.gitlab.com/omnibus/settings/ssl.html) [these instructions](https://docs.gitlab.com/omnibus/settings/ssl.html)
on the **secondary** node. on the **secondary** node.
### Step 6. Enable Git access over HTTP/HTTPS ### Step 5. Enable Git access over HTTP/HTTPS
Geo synchronizes repositories over HTTP/HTTPS, and therefore requires this clone Geo synchronizes repositories over HTTP/HTTPS, and therefore requires this clone
method to be enabled. Navigate to **Admin Area > Settings** method to be enabled. This is enabled by default, but if converting an existing node to Geo it should be checked:
(`/admin/application_settings/general`) on the **primary** node, and set
`Enabled Git access protocols` to `Both SSH and HTTP(S)` or `Only HTTP(S)`. 1. Navigate to **Admin Area > Settings** (`/admin/application_settings/general`) on the **primary** node.
1. Expand "Visibility and access controls".
1. Ensure "Enabled Git access protocols" is set to either "Both SSH and HTTP(S)" or "Only HTTP(S)".
### Step 7. Verify proper functioning of the **secondary** node ### Step 6. Verify proper functioning of the **secondary** node
Your **secondary** node is now configured! Your **secondary** node is now configured!
......
...@@ -325,7 +325,7 @@ In GitLab 10.2, synchronizing secondaries over SSH was deprecated. In 10.3, ...@@ -325,7 +325,7 @@ In GitLab 10.2, synchronizing secondaries over SSH was deprecated. In 10.3,
support is removed entirely. All installations will switch to the HTTP/HTTPS support is removed entirely. All installations will switch to the HTTP/HTTPS
cloning method instead. Before updating, ensure that all your Geo nodes are cloning method instead. Before updating, ensure that all your Geo nodes are
configured to use this method and that it works for your installation. In configured to use this method and that it works for your installation. In
particular, ensure that [Git access over HTTP/HTTPS is enabled](configuration.md#step-6-enable-git-access-over-httphttps). particular, ensure that [Git access over HTTP/HTTPS is enabled](configuration.md#step-5-enable-git-access-over-httphttps).
Synchronizing repositories over the public Internet using HTTP is insecure, so Synchronizing repositories over the public Internet using HTTP is insecure, so
you should ensure that you have HTTPS configured before updating. Note that you should ensure that you have HTTPS configured before updating. Note that
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment