From dc4d2d5a6d37fcf8385396a67bbc0d764eb548ff Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Tue, 5 Oct 2021 23:47:39 +0000
Subject: [PATCH 1/8] Add external_url config to Sidekiq nodes

---
 doc/administration/reference_architectures/10k_users.md | 8 +++++++-
 doc/administration/reference_architectures/25k_users.md | 8 +++++++-
 doc/administration/reference_architectures/3k_users.md  | 8 +++++++-
 doc/administration/reference_architectures/50k_users.md | 8 +++++++-
 doc/administration/reference_architectures/5k_users.md  | 8 +++++++-
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index e3bbf6110195db..4920489f2ca734 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -1604,9 +1604,15 @@ To configure the Sidekiq nodes, on each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Open `/etc/gitlab/gitlab.rb` with your editor:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
+   To maintain uniformity of links across nodes, the `external_url`
+   on the Sidekiq server should point to the external URL that users will use
+   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
+   which will route traffic to the GitLab application server:
 
    ```ruby
+   external_url 'https://gitlab.example.com'
+
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 782a5cc3af6101..0c412bb8be5cfb 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -1610,9 +1610,15 @@ To configure the Sidekiq nodes, on each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Open `/etc/gitlab/gitlab.rb` with your editor:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
+   To maintain uniformity of links across nodes, the `external_url`
+   on the Sidekiq server should point to the external URL that users will use
+   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
+   which will route traffic to the GitLab application server:
 
    ```ruby
+   external_url 'https://gitlab.example.com'
+
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index 80743a6a05fe47..b3c12d76e8b2f6 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1565,9 +1565,15 @@ To configure the Sidekiq nodes, one each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Open `/etc/gitlab/gitlab.rb` with your editor:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
+   To maintain uniformity of links across nodes, the `external_url`
+   on the Sidekiq server should point to the external URL that users will use
+   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
+   which will route traffic to the GitLab application server:
 
    ```ruby
+   external_url 'https://gitlab.example.com'
+
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index d9f5eaa93fee80..63566ee7f7f8af 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -1617,9 +1617,15 @@ To configure the Sidekiq nodes, on each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Open `/etc/gitlab/gitlab.rb` with your editor:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
+   To maintain uniformity of links across nodes, the `external_url`
+   on the Sidekiq server should point to the external URL that users will use
+   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
+   which will route traffic to the GitLab application server:
 
    ```ruby
+   external_url 'https://gitlab.example.com'
+
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index 61049a2200b367..11433ae9a9c16d 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1555,9 +1555,15 @@ To configure the Sidekiq nodes, one each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Open `/etc/gitlab/gitlab.rb` with your editor:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
+   To maintain uniformity of links across nodes, the `external_url`
+   on the Sidekiq server should point to the external URL that users will use
+   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
+   which will route traffic to the GitLab application server:
 
    ```ruby
+   external_url 'https://gitlab.example.com'
+
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
-- 
GitLab


From 9b378708b3ceb719886d26f37eb0cec0befa9536 Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 08:50:43 +0000
Subject: [PATCH 2/8] Add external_url config to Sidekiq general setup

---
 doc/administration/sidekiq.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/administration/sidekiq.md b/doc/administration/sidekiq.md
index e753832f2c37cc..134461f367d189 100644
--- a/doc/administration/sidekiq.md
+++ b/doc/administration/sidekiq.md
@@ -18,6 +18,12 @@ To configure the Sidekiq node:
 you want using steps 1 and 2 from the GitLab downloads page.
 **Do not complete any other steps on the download page.**
 1. Open `/etc/gitlab/gitlab.rb` with your editor.
+1. Define the `external_url`. This should point to the external URL that users will use to access GitLab and will either be the `external_url` set on your application server or the URL of a external load balancer which will route traffic to the GitLab application server:
+
+  ```ruby
+  external_url 'https://gitlab.example.com'
+  ```
+
 1. Generate the Sidekiq configuration:
 
    ```ruby
@@ -114,6 +120,8 @@ migrations performed.
 Here's what the ending `/etc/gitlab/gitlab.rb` would look like:
 
 ```ruby
+external_url 'https://gitlab.example.com'
+
 ########################################
 #####        Services Disabled       ###
 ########################################
-- 
GitLab


From 7e8366fe31b35ad25670dc28c7a335e2438e2dab Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 08:51:59 +0000
Subject: [PATCH 3/8] Fix bad indenting

---
 doc/administration/sidekiq.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/administration/sidekiq.md b/doc/administration/sidekiq.md
index 134461f367d189..1a31e56a574106 100644
--- a/doc/administration/sidekiq.md
+++ b/doc/administration/sidekiq.md
@@ -20,9 +20,9 @@ you want using steps 1 and 2 from the GitLab downloads page.
 1. Open `/etc/gitlab/gitlab.rb` with your editor.
 1. Define the `external_url`. This should point to the external URL that users will use to access GitLab and will either be the `external_url` set on your application server or the URL of a external load balancer which will route traffic to the GitLab application server:
 
-  ```ruby
-  external_url 'https://gitlab.example.com'
-  ```
+   ```ruby
+   external_url 'https://gitlab.example.com'
+   ```
 
 1. Generate the Sidekiq configuration:
 
-- 
GitLab


From 9aa31cfe024e3286b5d8edf35712876dd858166b Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 09:01:34 +0000
Subject: [PATCH 4/8] Update step to match ref arch step

---
 doc/administration/sidekiq.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/administration/sidekiq.md b/doc/administration/sidekiq.md
index 1a31e56a574106..d1bed524e569d9 100644
--- a/doc/administration/sidekiq.md
+++ b/doc/administration/sidekiq.md
@@ -18,7 +18,10 @@ To configure the Sidekiq node:
 you want using steps 1 and 2 from the GitLab downloads page.
 **Do not complete any other steps on the download page.**
 1. Open `/etc/gitlab/gitlab.rb` with your editor.
-1. Define the `external_url`. This should point to the external URL that users will use to access GitLab and will either be the `external_url` set on your application server or the URL of a external load balancer which will route traffic to the GitLab application server:
+1. Define the `external_url`. To maintain uniformity of links across nodes, the `external_url`
+   on the Sidekiq server should point to the external URL that users will use to access GitLab.
+   This will either be the `external_url` set on your application server or the URL of a external
+   load balancer which will route traffic to the GitLab application server:
 
    ```ruby
    external_url 'https://gitlab.example.com'
-- 
GitLab


From b5a6534456be6a25cbae9d5e6046925b2e92d740 Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 09:03:47 +0000
Subject: [PATCH 5/8] Fix up line lengths and formatting

---
 doc/administration/sidekiq.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/administration/sidekiq.md b/doc/administration/sidekiq.md
index d1bed524e569d9..13b21a1f5be1cf 100644
--- a/doc/administration/sidekiq.md
+++ b/doc/administration/sidekiq.md
@@ -18,10 +18,11 @@ To configure the Sidekiq node:
 you want using steps 1 and 2 from the GitLab downloads page.
 **Do not complete any other steps on the download page.**
 1. Open `/etc/gitlab/gitlab.rb` with your editor.
-1. Define the `external_url`. To maintain uniformity of links across nodes, the `external_url`
-   on the Sidekiq server should point to the external URL that users will use to access GitLab.
-   This will either be the `external_url` set on your application server or the URL of a external
-   load balancer which will route traffic to the GitLab application server:
+1. Define the `external_url`. To maintain uniformity of links across nodes, the
+`external_url` on the Sidekiq server should point to the external URL that users
+will use to access GitLab. This will either be the `external_url` set on your
+application server or the URL of a external load balancer which will route traffic
+to the GitLab application server:
 
    ```ruby
    external_url 'https://gitlab.example.com'
-- 
GitLab


From af4acb65f5034e27da080604f76f3d3bfb4dfd38 Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 19:06:55 +0000
Subject: [PATCH 6/8] Move external_url config to last step

---
 doc/administration/sidekiq.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/administration/sidekiq.md b/doc/administration/sidekiq.md
index 13b21a1f5be1cf..4aee88ed9cbf7c 100644
--- a/doc/administration/sidekiq.md
+++ b/doc/administration/sidekiq.md
@@ -18,16 +18,6 @@ To configure the Sidekiq node:
 you want using steps 1 and 2 from the GitLab downloads page.
 **Do not complete any other steps on the download page.**
 1. Open `/etc/gitlab/gitlab.rb` with your editor.
-1. Define the `external_url`. To maintain uniformity of links across nodes, the
-`external_url` on the Sidekiq server should point to the external URL that users
-will use to access GitLab. This will either be the `external_url` set on your
-application server or the URL of a external load balancer which will route traffic
-to the GitLab application server:
-
-   ```ruby
-   external_url 'https://gitlab.example.com'
-   ```
-
 1. Generate the Sidekiq configuration:
 
    ```ruby
@@ -114,6 +104,16 @@ to the GitLab application server:
   
    You must also copy the `registry.key` file to each Sidekiq node.
 
+1. Define the `external_url`. To maintain uniformity of links across nodes, the
+   `external_url` on the Sidekiq server should point to the external URL that users
+   will use to access GitLab. This will either be the `external_url` set on your
+   application server or the URL of a external load balancer which will route traffic
+   to the GitLab application server:
+
+   ```ruby
+   external_url 'https://gitlab.example.com'
+   ```
+
 1. Run `gitlab-ctl reconfigure`.
 
 You will need to restart the Sidekiq nodes after an update has occurred and database
@@ -124,8 +124,6 @@ migrations performed.
 Here's what the ending `/etc/gitlab/gitlab.rb` would look like:
 
 ```ruby
-external_url 'https://gitlab.example.com'
-
 ########################################
 #####        Services Disabled       ###
 ########################################
@@ -206,6 +204,9 @@ gitlab_rails['monitoring_whitelist'] = ['10.10.1.42', '127.0.0.1']
 # Container Registry URL for cleanup jobs
 registry_external_url 'https://registry.example.com'
 gitlab_rails['registry_api_url'] = "https://registry.example.com"
+
+# External URL (this should match the URL used to access your GitLab instance)
+external_url 'https://gitlab.example.com'
 ```
 
 ## Further reading
-- 
GitLab


From 98c995432819feaa7d698d88beb81522b429bce5 Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 19:21:12 +0000
Subject: [PATCH 7/8] Move external_url to follow general Sidekiq config

---
 .../reference_architectures/10k_users.md             | 12 +++++-------
 .../reference_architectures/25k_users.md             | 12 +++++-------
 .../reference_architectures/3k_users.md              | 12 +++++-------
 .../reference_architectures/50k_users.md             | 12 +++++-------
 .../reference_architectures/5k_users.md              | 12 +++++-------
 5 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index 4920489f2ca734..0a1b6286e78109 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -1604,15 +1604,9 @@ To configure the Sidekiq nodes, on each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
-   To maintain uniformity of links across nodes, the `external_url`
-   on the Sidekiq server should point to the external URL that users will use
-   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
-   which will route traffic to the GitLab application server:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration:
 
    ```ruby
-   external_url 'https://gitlab.example.com'
-
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
@@ -1687,6 +1681,10 @@ To configure the Sidekiq nodes, on each one:
    # Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 0c412bb8be5cfb..1048044c196a90 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -1610,15 +1610,9 @@ To configure the Sidekiq nodes, on each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
-   To maintain uniformity of links across nodes, the `external_url`
-   on the Sidekiq server should point to the external URL that users will use
-   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
-   which will route traffic to the GitLab application server:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration:
 
    ```ruby
-   external_url 'https://gitlab.example.com'
-
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
@@ -1693,6 +1687,10 @@ To configure the Sidekiq nodes, on each one:
    # Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index b3c12d76e8b2f6..62271a100e73db 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1565,15 +1565,9 @@ To configure the Sidekiq nodes, one each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
-   To maintain uniformity of links across nodes, the `external_url`
-   on the Sidekiq server should point to the external URL that users will use
-   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
-   which will route traffic to the GitLab application server:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration:
 
    ```ruby
-   external_url 'https://gitlab.example.com'
-
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
@@ -1629,6 +1623,10 @@ To configure the Sidekiq nodes, one each one:
    ## Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index 63566ee7f7f8af..240fee3a0c7ac7 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -1617,15 +1617,9 @@ To configure the Sidekiq nodes, on each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
-   To maintain uniformity of links across nodes, the `external_url`
-   on the Sidekiq server should point to the external URL that users will use
-   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
-   which will route traffic to the GitLab application server:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration:
 
    ```ruby
-   external_url 'https://gitlab.example.com'
-
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
@@ -1700,6 +1694,10 @@ To configure the Sidekiq nodes, on each one:
    ## Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index 11433ae9a9c16d..e54bdeb05278a4 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1555,15 +1555,9 @@ To configure the Sidekiq nodes, one each one:
 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
    package of your choice. Be sure to follow _only_ installation steps 1 and 2
    on the page.
-1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
-   To maintain uniformity of links across nodes, the `external_url`
-   on the Sidekiq server should point to the external URL that users will use
-   to access GitLab. This would be the URL of the [external load balancer](#configure-the-external-load-balancer)
-   which will route traffic to the GitLab application server:
+1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration:
 
    ```ruby
-   external_url 'https://gitlab.example.com'
-
    # Avoid running unnecessary services on the Sidekiq server
    gitaly['enable'] = false
    postgresql['enable'] = false
@@ -1620,6 +1614,10 @@ To configure the Sidekiq nodes, one each one:
    ## Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
-- 
GitLab


From 68b290b8058371476fd5633cf43a7f3f66d61ad9 Mon Sep 17 00:00:00 2001
From: Anton Smith <asmith@gitlab.com>
Date: Wed, 6 Oct 2021 20:16:46 +0000
Subject: [PATCH 8/8] Moved external_url under disabled settings

---
 doc/administration/reference_architectures/10k_users.md | 8 ++++----
 doc/administration/reference_architectures/25k_users.md | 8 ++++----
 doc/administration/reference_architectures/3k_users.md  | 8 ++++----
 doc/administration/reference_architectures/50k_users.md | 8 ++++----
 doc/administration/reference_architectures/5k_users.md  | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index 0a1b6286e78109..4214589b2e080e 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -1619,6 +1619,10 @@ To configure the Sidekiq nodes, on each one:
    gitlab_exporter['enable'] = false
    nginx['enable'] = false
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Redis
    ## Redis connection details
    ## First cluster that will host the cache
@@ -1681,10 +1685,6 @@ To configure the Sidekiq nodes, on each one:
    # Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
-   # External URL
-   ## This should match the URL of the external load balancer
-   external_url 'https://gitlab.example.com'
-
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 1048044c196a90..38fe4ec4fe3776 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -1625,6 +1625,10 @@ To configure the Sidekiq nodes, on each one:
    gitlab_exporter['enable'] = false
    nginx['enable'] = false
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Redis
    ## Redis connection details
    ## First cluster that will host the cache
@@ -1687,10 +1691,6 @@ To configure the Sidekiq nodes, on each one:
    # Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
-   # External URL
-   ## This should match the URL of the external load balancer
-   external_url 'https://gitlab.example.com'
-
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index 62271a100e73db..c1be04d505e6f7 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1580,6 +1580,10 @@ To configure the Sidekiq nodes, one each one:
    gitlab_exporter['enable'] = false
    nginx['enable'] = false
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Redis
    redis['master_name'] = 'gitlab-redis'
 
@@ -1623,10 +1627,6 @@ To configure the Sidekiq nodes, one each one:
    ## Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
-   # External URL
-   ## This should match the URL of the external load balancer
-   external_url 'https://gitlab.example.com'
-
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index 240fee3a0c7ac7..d1725f60d85ca2 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -1632,6 +1632,10 @@ To configure the Sidekiq nodes, on each one:
    gitlab_exporter['enable'] = false
    nginx['enable'] = false
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Redis
    ## Redis connection details
    ## First cluster that will host the cache
@@ -1694,10 +1698,6 @@ To configure the Sidekiq nodes, on each one:
    ## Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
-   # External URL
-   ## This should match the URL of the external load balancer
-   external_url 'https://gitlab.example.com'
-
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index e54bdeb05278a4..845f0c42d7b334 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1570,6 +1570,10 @@ To configure the Sidekiq nodes, one each one:
    gitlab_exporter['enable'] = false
    nginx['enable'] = false
 
+   # External URL
+   ## This should match the URL of the external load balancer
+   external_url 'https://gitlab.example.com'
+
    # Redis
    ## Must be the same in every sentinel node
    redis['master_name'] = 'gitlab-redis'
@@ -1614,10 +1618,6 @@ To configure the Sidekiq nodes, one each one:
    ## Set number of Sidekiq threads per queue process to the recommend number of 10
    sidekiq['max_concurrency'] = 10
 
-   # External URL
-   ## This should match the URL of the external load balancer
-   external_url 'https://gitlab.example.com'
-
    # Monitoring
    consul['enable'] = true
    consul['monitoring_service_discovery'] =  true
-- 
GitLab