From b99cbf47af335309dd0832bb772d0527c5e4f060 Mon Sep 17 00:00:00 2001 From: "Sytse Sijbrandij (admin)" Date: Mon, 10 Aug 2015 18:39:50 +0000 Subject: Database size --- doc/install/requirements.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/install') diff --git a/doc/install/requirements.md b/doc/install/requirements.md index e44ce25b6b4..aa0d03b75bc 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -93,7 +93,7 @@ To change the Unicorn workers when you have the Omnibus package please see [the ## Database -If you want to run the database separately, the **recommended** database size is **1 MB per user**. +If you want to run the database separately expect a size of about 1 MB per user. ## Redis and Sidekiq @@ -113,4 +113,4 @@ On a very active server (10,000 active users) the Sidekiq process can use 1GB+ o ### Common UI problems with IE -If you experience UI issues with Internet Explorer, please make sure that you have the `Compatibility View` mode disabled. +If you experience UI issues with Internet Explorer, please make sure that you have the `Compatibility View` mode disabled. \ No newline at end of file -- cgit v1.2.1 From 9f10943c1a76576ac40d96189a28a4d6123a75d8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 10:28:42 +0200 Subject: Revert "Merge branch 'drop-satellites'" This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets --- doc/install/installation.md | 4 ++++ doc/install/requirements.md | 2 +- doc/install/structure.md | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'doc/install') diff --git a/doc/install/installation.md b/doc/install/installation.md index 55b6f216dde..6e2bb4191ca 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -216,6 +216,10 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da sudo chmod -R u+rwX,go-w log/ sudo chmod -R u+rwX tmp/ + # Create directory for satellites + sudo -u git -H mkdir /home/git/gitlab-satellites + sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites + # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories sudo chmod -R u+rwX tmp/pids/ sudo chmod -R u+rwX tmp/sockets/ diff --git a/doc/install/requirements.md b/doc/install/requirements.md index e44ce25b6b4..605977097b4 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -40,7 +40,7 @@ We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/) but GitLab ### Storage -The necessary hard drive space largely depends on the size of the repos you want to store in GitLab but as a *rule of thumb* you should have at least as much free space as all your repos combined take up. +The necessary hard drive space largely depends on the size of the repos you want to store in GitLab but as a *rule of thumb* you should have at least twice as much free space as all your repos combined take up. You need twice the storage because [GitLab satellites](structure.md) contain an extra copy of each repo. If you want to be flexible about growing your hard drive space in the future consider mounting it using LVM so you can add more hard drives when you need them. diff --git a/doc/install/structure.md b/doc/install/structure.md index d58b0040eef..5c03f073c18 100644 --- a/doc/install/structure.md +++ b/doc/install/structure.md @@ -6,14 +6,16 @@ This is the directory structure you will end up with following the instructions | |-- git | |-- .ssh | |-- gitlab + | |-- gitlab-satellites | |-- gitlab-shell | |-- repositories * `/home/git/.ssh` - contains openssh settings. Specifically the `authorized_keys` file managed by gitlab-shell. * `/home/git/gitlab` - GitLab core software. +* `/home/git/gitlab-satellites` - checked out repositories for merge requests and file editing from web UI. This can be treated as a temporary files directory. * `/home/git/gitlab-shell` - Core add-on component of GitLab. Maintains SSH cloning and other functionality. * `/home/git/repositories` - bare repositories for all projects organized by namespace. This is where the git repositories which are pushed/pulled are maintained for all projects. **This area is critical data for projects. [Keep a backup](../raketasks/backup_restore.md)** -*Note: the default locations for repositories can be configured in `config/gitlab.yml` of GitLab and `config.yml` of gitlab-shell.* +*Note: the default locations for gitlab-satellites and repositories can be configured in `config/gitlab.yml` of GitLab and `config.yml` of gitlab-shell.* To see a more in-depth overview see the [GitLab architecture doc](../development/architecture.md). -- cgit v1.2.1