summaryrefslogtreecommitdiff
path: root/doc/administration/geo/replication/troubleshooting.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 09:06:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 09:06:29 +0000
commitc02f53288a838166a28518983fae3b80ca5936d8 (patch)
treecd8af90618ac55809e7782bad09246874876f7c2 /doc/administration/geo/replication/troubleshooting.md
parent688e33953d34ab8cd348d02ce79d8fdfe5353a03 (diff)
downloadgitlab-ce-c02f53288a838166a28518983fae3b80ca5936d8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/geo/replication/troubleshooting.md')
-rw-r--r--doc/administration/geo/replication/troubleshooting.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index d2fe02abbab..435919d8fe0 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -115,10 +115,12 @@ Any **secondary** nodes should point only to read-only instances.
#### Can Geo detect the current node correctly?
-Geo finds the current machine's name in `/etc/gitlab/gitlab.rb` by first looking
-for `gitlab_rails['geo_node_name']`. If it is not defined, then it defaults to
-the external URL defined in e.g. `external_url "http://gitlab.example.com"`. To
-get a machine's name, run:
+Geo finds the current machine's name in `/etc/gitlab/gitlab.rb` by:
+
+- Using the `gitlab_rails['geo_node_name']` setting.
+- If that is not defined, using the `external_url` setting.
+
+To get a machine's name, run:
```sh
sudo gitlab-rails runner "puts GeoNode.current_node_name"