Commit 2dd4314f authored by Robert Speicher's avatar Robert Speicher Committed by Robert Speicher

Merge branch 'client-max-body-size' into 'master'

Do not limit workhorse POST/PUT size in NGINX

Limiting, if any, should happen in gitlab-workhorse.

See merge request !1831
parent 371e8505
...@@ -114,7 +114,6 @@ server { ...@@ -114,7 +114,6 @@ 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;
...@@ -140,7 +139,6 @@ server { ...@@ -140,7 +139,6 @@ 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 {
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;
...@@ -148,13 +146,13 @@ server { ...@@ -148,13 +146,13 @@ server {
# 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 {
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 @gitlab-workhorse { location @gitlab-workhorse {
client_max_body_size 0;
## If you use HTTPS make sure you disable gzip compression ## If you use HTTPS make sure you disable gzip compression
## to be safe against BREACH attack. ## to be safe against BREACH attack.
# gzip off; # gzip off;
......
...@@ -161,7 +161,6 @@ server { ...@@ -161,7 +161,6 @@ 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;
...@@ -187,7 +186,6 @@ server { ...@@ -187,7 +186,6 @@ 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 {
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;
...@@ -195,13 +193,13 @@ server { ...@@ -195,13 +193,13 @@ server {
# 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 {
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 @gitlab-workhorse { location @gitlab-workhorse {
client_max_body_size 0;
## If you use HTTPS make sure you disable gzip compression ## If you use HTTPS make sure you disable gzip compression
## to be safe against BREACH attack. ## to be safe against BREACH attack.
gzip off; gzip off;
......
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