Skip to content

G
gitlab-ce
Commit 3c2914b4 authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

Merge branch 'nginx-workhorse-upload-limit' into 'master' 

Nginx workhorse upload limit

See merge request !1919
parents 8f4b6d51 f1710073
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 12 deletions
lib/support/nginx/gitlab
View file @ 3c2914b4
...@@ -114,24 +114,28 @@ server { ...@@ -114,24 +114,28 @@ server {
} }
location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects { location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
} }
location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ { location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
} }
location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive { location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
} }
location ~ ^/api/v3/projects/.*/repository/archive { location ~ ^/api/v3/projects/.*/repository/archive {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
...@@ -139,16 +143,18 @@ server { ...@@ -139,16 +143,18 @@ server {
# Build artifacts should be submitted to this location # Build artifacts should be submitted to this location
location ~ ^/[\w\.-]+/[\w\.-]+/builds/download { location ~ ^/[\w\.-]+/[\w\.-]+/builds/download {
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block client_max_body_size 0;
error_page 418 = @gitlab-workhorse; # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
return 418; error_page 418 = @gitlab-workhorse;
return 418;
} }
# Build artifacts should be submitted to this location # Build artifacts should be submitted to this location
location ~ /ci/api/v1/builds/[0-9]+/artifacts { location ~ /ci/api/v1/builds/[0-9]+/artifacts {
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block client_max_body_size 0;
error_page 418 = @gitlab-workhorse; # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
return 418; error_page 418 = @gitlab-workhorse;
return 418;
} }
location @gitlab-workhorse { location @gitlab-workhorse {
......
lib/support/nginx/gitlab-ssl
View file @ 3c2914b4
...@@ -161,24 +161,28 @@ server { ...@@ -161,24 +161,28 @@ server {
} }
location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects { location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
} }
location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ { location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
} }
location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive { location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
} }
location ~ ^/api/v3/projects/.*/repository/archive { location ~ ^/api/v3/projects/.*/repository/archive {
client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse; error_page 418 = @gitlab-workhorse;
return 418; return 418;
...@@ -186,16 +190,18 @@ server { ...@@ -186,16 +190,18 @@ server {
# Build artifacts should be submitted to this location # Build artifacts should be submitted to this location
location ~ ^/[\w\.-]+/[\w\.-]+/builds/download { location ~ ^/[\w\.-]+/[\w\.-]+/builds/download {
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block client_max_body_size 0;
error_page 418 = @gitlab-workhorse; # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
return 418; error_page 418 = @gitlab-workhorse;
return 418;
} }
# Build artifacts should be submitted to this location # Build artifacts should be submitted to this location
location ~ /ci/api/v1/builds/[0-9]+/artifacts { location ~ /ci/api/v1/builds/[0-9]+/artifacts {
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block client_max_body_size 0;
error_page 418 = @gitlab-workhorse; # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
return 418; error_page 418 = @gitlab-workhorse;
return 418;
} }
location @gitlab-workhorse { location @gitlab-workhorse {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7