diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-28 10:34:46 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-28 10:34:46 +0000 |
commit | 365015e3c935afd8e4d3073078712cccd3077204 (patch) | |
tree | c4818945d74bf43ced6da73e00e0c97a217f9e7e | |
parent | 1897d75bdc8a661a8bba9ccfd4aba6e905556e2c (diff) | |
parent | 5eba2670c7f615ff7d782b80082378c641d17296 (diff) | |
download | gitlab-ce-365015e3c935afd8e4d3073078712cccd3077204.tar.gz |
Merge branch 'gitlab_architecture' into 'master'
Refactor GitLab architecture document
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14236
See merge request !3694
-rw-r--r-- | doc/development/architecture.md | 4 | ||||
-rw-r--r-- | doc/development/gitlab_architecture_diagram.png | bin | 0 -> 46947 bytes | |||
-rw-r--r-- | doc/development/gitlab_diagram_overview.png | bin | 256612 -> 0 bytes |
3 files changed, 3 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 12e33406cb6..33fd50f4c11 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -52,7 +52,9 @@ To serve repositories over SSH there's an add-on application called gitlab-shell ### Components -![GitLab Diagram Overview](gitlab_diagram_overview.png) +![GitLab Diagram Overview](gitlab_architecture_diagram.png) + +_[edit diagram (for GitLab team members only)](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 Binary files differnew file mode 100644 index 00000000000..9ab7ffd3c7b --- /dev/null +++ b/doc/development/gitlab_architecture_diagram.png diff --git a/doc/development/gitlab_diagram_overview.png b/doc/development/gitlab_diagram_overview.png Binary files differdeleted file mode 100644 index d9b9eed3d8f..00000000000 --- a/doc/development/gitlab_diagram_overview.png +++ /dev/null |