summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChenjerai Katanda <ckatanda@gitlab.com>2017-07-27 16:48:14 +0000
committerChenjerai Katanda <ckatanda@gitlab.com>2017-07-27 16:48:14 +0000
commit773ef0b0a326808b7d4aa34df31435f8a7f4e057 (patch)
tree0472f09591d8563c01e4da2a7c39c9691cf36479
parentb8a6eafa0fb6a78d53f7edadee10db064cdb6408 (diff)
downloadgitlab-ce-update-server-terms-for-ha-docs.tar.gz
-rw-r--r--doc/administration/high_availability/gitlab.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md
index 83d73d75507..42666357faf 100644
--- a/doc/administration/high_availability/gitlab.md
+++ b/doc/administration/high_availability/gitlab.md
@@ -72,8 +72,8 @@ for each GitLab application server in your environment.
```
> **Note:** To maintain uniformity of links across HA clusters, the `external_url`
- on the first application server as well as all the other additional application
- servers should point to the eventual url that users will use to access GitLab.
+ on the first application server as well as the additional application
+ servers should point to the external url that users will use to access GitLab.
In a typical HA setup, this will be the url of the load balancer which will
route traffic to all GitLab application servers in the HA cluster.
@@ -95,10 +95,10 @@ It is not necessary to run this on additional application servers.
[Nginx documentation](http://docs.gitlab.com/omnibus/settings/nginx.html#enable-https)
for more information.
-## Additional configuration for other GitLab application servers
+## Extra configuration for additional GitLab application servers
Additional GitLab servers (servers configured **after** the first GitLab server)
-need some additional configuration.
+need some extra configuration.
1. Configure shared secrets. These values can be obtained from the primary
GitLab server in `/etc/gitlab/gitlab-secrets.json`. Add these to