From fd9eb4036c6e74c47573a00325312d5d6699be25 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Wed, 13 Apr 2016 12:39:11 +0300 Subject: Replace GitLab architecture diagram [ci skip] --- doc/development/architecture.md | 2 +- doc/development/gitlab_architecture_diagram.png | Bin 0 -> 280231 bytes doc/development/gitlab_diagram_overview.png | Bin 256612 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 doc/development/gitlab_architecture_diagram.png delete mode 100644 doc/development/gitlab_diagram_overview.png (limited to 'doc') diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 12e33406cb6..da25d395294 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -52,7 +52,7 @@ 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) 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 new file mode 100644 index 00000000000..184a978b11a Binary files /dev/null and b/doc/development/gitlab_architecture_diagram.png differ diff --git a/doc/development/gitlab_diagram_overview.png b/doc/development/gitlab_diagram_overview.png deleted file mode 100644 index d9b9eed3d8f..00000000000 Binary files a/doc/development/gitlab_diagram_overview.png and /dev/null differ -- cgit v1.2.1 From bb5a6e3c51c591b449b89dd80a76fd3f598d84d8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 23 Jun 2016 02:15:51 +0000 Subject: Update GitLab architecture diagram, include Google draw link [ci skip] --- doc/development/architecture.md | 2 ++ doc/development/gitlab_architecture_diagram.png | Bin 280231 -> 46947 bytes 2 files changed, 2 insertions(+) (limited to 'doc') 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 Binary files a/doc/development/gitlab_architecture_diagram.png and b/doc/development/gitlab_architecture_diagram.png differ -- cgit v1.2.1 From 5eba2670c7f615ff7d782b80082378c641d17296 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 28 Jun 2016 03:12:26 +0000 Subject: Add "GitLab team members only" to diagram link --- doc/development/architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 4a681fb0e63..33fd50f4c11 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -54,7 +54,7 @@ To serve repositories over SSH there's an add-on application called gitlab-shell ![GitLab Diagram Overview](gitlab_architecture_diagram.png) -_[edit diagram](https://docs.google.com/drawings/d/1fBzAyklyveF-i-2q-OHUIqDkYfjjxC4mq5shwKSZHLs/edit)_ +_[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. -- cgit v1.2.1