summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-12-13 18:16:43 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-12-13 18:16:43 +0000
commit477890261cbec008af1c76a3454c89bfa94d22bd (patch)
tree56589a592ffc544692206e766dea67934cd58fa7
parent0bb17425943a3fba430ed3034cf854e274298abc (diff)
parentfb11bc8ab05102dec19fcd375ee618d87ff79201 (diff)
downloadgitlab-ce-477890261cbec008af1c76a3454c89bfa94d22bd.tar.gz
Merge branch 'revert-accidental-master-push' into 'master'
Revert "Document gitaly network architecture" See merge request gitlab-org/gitlab-ce!23743
-rw-r--r--doc/administration/gitaly/index.md19
1 files changed, 0 insertions, 19 deletions
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index d7c45e7d91d..dc6a71e2ebd 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -49,25 +49,6 @@ Starting with GitLab 11.4, Gitaly is a replacement for NFS except
when the [Elastic Search indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer)
is used.
-### Network architecture
-
-- gitlab-rails shards repositories into "repository storages"
-- gitlab-rails/config/gitlab.yml contains a map from storage names to
- (Gitaly address, Gitaly token) pairs
-- the `storage name` -\> `(Gitaly address, Gitaly token)` map in
- gitlab.yml is the single source of truth for the Gitaly network
- topology
-- a (Gitaly address, Gitaly token) corresponds to a Gitaly server
-- a Gitaly server hosts one or more storages
-- Gitaly addresses must be specified in such a way that they resolve
- correctly for ALL Gitaly clients
-- Gitaly clients are: unicorn, sidekiq, gitlab-workhorse,
- gitlab-shell, and Gitaly itself
-- special case: a Gitaly server must be able to make RPC calls **to
- itself** via its own (Gitaly address, Gitaly token) pair as
- specified in gitlab-rails/config/gitlab.yml
-- Gitaly servers must not be exposed to the public internet
-
Gitaly network traffic is unencrypted so you should use a firewall to
restrict access to your Gitaly server.