From 119c782e0b9f691a3eeff1f44c23522aa4f9c552 Mon Sep 17 00:00:00 2001 From: dosire Date: Wed, 22 Jan 2014 17:01:47 +0100 Subject: More explanation for upload limits. --- config/gitlab.yml.example | 1 + lib/support/nginx/gitlab | 1 + 2 files changed, 2 insertions(+) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c63e8cb7ded..c4769938d18 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -204,6 +204,7 @@ production: &base bin_path: /usr/bin/git # Max size of a git object (e.g. a commit), in bytes # This value can be increased if you have very large commits + # Please also change the limit for your webserver (for Nginx see lib/support/nginx/gitlab) max_size: 5242880 # 5.megabytes # Git timeout to read a commit, in seconds timeout: 10 diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index d1d959e152e..99691fe94a5 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -13,6 +13,7 @@ server { root /home/git/gitlab/public; # Set value of client_max_body_size to at least the value of git.max_size in gitlab.yml + # Also increase this if you want to upload large attachments client_max_body_size 5m; # individual nginx logs for this gitlab vhost -- cgit v1.2.1 From 7ad70a56d3258687b5e129b15dbfca4edb199eb4 Mon Sep 17 00:00:00 2001 From: dosire Date: Wed, 22 Jan 2014 17:51:00 +0100 Subject: Git over ssh and http are different things. --- config/gitlab.yml.example | 4 ++-- lib/support/nginx/gitlab | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c4769938d18..67adbfb9a4c 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -203,8 +203,8 @@ production: &base git: bin_path: /usr/bin/git # Max size of a git object (e.g. a commit), in bytes - # This value can be increased if you have very large commits - # Please also change the limit for your webserver (for Nginx see lib/support/nginx/gitlab) + # This value can be increased if you have very large commits with git over ssh + # Git over http is limited by your webserver (for Nginx see lib/support/nginx/gitlab) max_size: 5242880 # 5.megabytes # Git timeout to read a commit, in seconds timeout: 10 diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 99691fe94a5..ee78d78369f 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -12,8 +12,8 @@ server { server_tokens off; # don't show the version number, a security best practice root /home/git/gitlab/public; - # Set value of client_max_body_size to at least the value of git.max_size in gitlab.yml - # Also increase this if you want to upload large attachments + # Increase this if you want to upload large attachments + # Or if you want to accept large git objects over http client_max_body_size 5m; # individual nginx logs for this gitlab vhost -- cgit v1.2.1 From 4fc17cf13f955e9deedcfba81009dd658c4779a9 Mon Sep 17 00:00:00 2001 From: dosire Date: Mon, 27 Jan 2014 13:01:20 +0100 Subject: Reword the git explanation. --- config/gitlab.yml.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 67adbfb9a4c..be9ca8dc8c1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -202,9 +202,9 @@ production: &base # Use the default values unless you really know what you are doing git: bin_path: /usr/bin/git - # Max size of a git object (e.g. a commit), in bytes - # This value can be increased if you have very large commits with git over ssh - # Git over http is limited by your webserver (for Nginx see lib/support/nginx/gitlab) + # The next value is the maximum memory size grit can use + # Given in number of bytes per git object (e.g. a commit) + # This value can be increased if you have very large commits max_size: 5242880 # 5.megabytes # Git timeout to read a commit, in seconds timeout: 10 -- cgit v1.2.1