Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 4 deletions

diff --git a/doc/administration/geo/replication/docker_registry.md b/doc/administration/geo/replication/docker_registry.md
index 537f8f57420..12cd39c0213 100644
--- a/doc/administration/geo/replication/docker_registry.md
+++ b/doc/administration/geo/replication/docker_registry.md
@@ -63,6 +63,11 @@ We need to make Docker Registry send notification events to the
    notification secret in `registry.notification_secret` section of
    `/etc/gitlab/gitlab.rb` file.
 
+   NOTE: **Note:**
+   If you use GitLab HA, you will also have to specify
+   the notification secret in `registry.notification_secret` section of
+   `/etc/gitlab/gitlab.rb` file for every web node.
+
 1. Reconfigure the **primary** node for the change to take effect:
 
    ```sh
@@ -94,10 +99,8 @@ generate a short-lived JWT that is pull-only-capable to access the
 1. Edit `/etc/gitlab/gitlab.rb`:
 
    ```ruby
-   gitlab_rails['registry_replication'] = {
-     enabled: true,
-     primary_api_url: 'http://primary.example.com:5000/' # internal address to the primary registry, will be used by GitLab to directly communicate with primary registry API
-   }
+   gitlab_rails['geo_registry_replication_enabled'] = true
+   gitlab_rails['geo_registry_replication_primary_api_url'] = 'http://primary.example.com:5000/' # internal address to the primary registry, will be used by GitLab to directly communicate with primary registry API
    ```
 
 1. Reconfigure the **secondary** node for the change to take effect: