summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorChris Wilson <chris@chrisjwilson.com>2016-06-23 02:15:51 +0000
committerChris Wilson <chris@chrisjwilson.com>2016-06-23 02:21:39 +0000
commitbb5a6e3c51c591b449b89dd80a76fd3f598d84d8 (patch)
tree325156b62693cb60b3caa32b47b85c0037d55c8e /doc/development
parentfd9eb4036c6e74c47573a00325312d5d6699be25 (diff)
downloadgitlab-ce-bb5a6e3c51c591b449b89dd80a76fd3f598d84d8.tar.gz
Update GitLab architecture diagram, include Google draw link
[ci skip]
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/architecture.md2
-rw-r--r--doc/development/gitlab_architecture_diagram.pngbin280231 -> 46947 bytes
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index da25d395294..4a681fb0e63 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -53,6 +53,8 @@ To serve repositories over SSH there's an add-on application called gitlab-shell
### Components
![GitLab Diagram Overview](gitlab_architecture_diagram.png)
+
+_[edit diagram](https://docs.google.com/drawings/d/1fBzAyklyveF-i-2q-OHUIqDkYfjjxC4mq5shwKSZHLs/edit)_
A typical install of GitLab will be on GNU/Linux. It uses Nginx or Apache as a web front end to proxypass the Unicorn web server. By default, communication between Unicorn and the front end is via a Unix domain socket but forwarding requests via TCP is also supported. The web front end accesses `/home/git/gitlab/public` bypassing the Unicorn server to serve static pages, uploads (e.g. avatar images or attachments), and precompiled assets. GitLab serves web pages and a [GitLab API](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/api) using the Unicorn web server. It uses Sidekiq as a job queue which, in turn, uses redis as a non-persistent database backend for job information, meta data, and incoming jobs.
diff --git a/doc/development/gitlab_architecture_diagram.png b/doc/development/gitlab_architecture_diagram.png
index 184a978b11a..9ab7ffd3c7b 100644
--- a/doc/development/gitlab_architecture_diagram.png
+++ b/doc/development/gitlab_architecture_diagram.png
Binary files differ