archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

nginx: removed proxy_max_temp_file_size configuration from vhost configuration

Browse Source
This commit is contained in:
Sameer Naik 2015-04-13 16:55:42 +05:30
parent 0d8b534815
commit eea0a43971
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/config/nginx/gitlab
View File

@ -85,15 +85,14 @@ server {
## to be safe against BREACH attack.
# gzip off;
add_header X-Accel-Buffering {{NGINX_ACCEL_BUFFERING}};
## https://github.com/gitlabhq/gitlabhq/issues/694
## Some requests take more than 30 seconds.
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_redirect off;
proxy_buffering {{NGINX_PROXY_BUFFERING}};
proxy_max_temp_file_size {{NGINX_PROXY_MAX_TEMP_FILE_SIZE}};
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

1
assets/config/nginx/gitlab-ssl
View File

@ -141,7 +141,6 @@ server {
proxy_connect_timeout 300;
proxy_redirect off;
proxy_buffering {{NGINX_PROXY_BUFFERING}};
proxy_max_temp_file_size {{NGINX_PROXY_MAX_TEMP_FILE_SIZE}};
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;

2
assets/init
View File

@ -52,7 +52,6 @@ case "$NGINX_MAX_UPLOAD_SIZE" in
*[gG] ) GITLAB_MAX_SIZE=$(($GITLAB_MAX_SIZE * 1073741824));;
esac
NGINX_PROXY_BUFFERING=${NGINX_PROXY_BUFFERING:-on}
NGINX_PROXY_MAX_TEMP_FILE_SIZE=${NGINX_PROXY_MAX_TEMP_FILE_SIZE:-1024m}
NGINX_ACCEL_BUFFERING=${NGINX_ACCEL_BUFFERING:-yes}
REDIS_HOST=${REDIS_HOST:-}
@ -636,7 +635,6 @@ sed 's/worker_processes .*/worker_processes '"${NGINX_WORKERS}"';/' -i /etc/ngin
sed 's/{{NGINX_MAX_UPLOAD_SIZE}}/'"${NGINX_MAX_UPLOAD_SIZE}"'/' -i /etc/nginx/sites-enabled/gitlab
sed 's/{{NGINX_X_FORWARDED_PROTO}}/'"${NGINX_X_FORWARDED_PROTO}"'/' -i /etc/nginx/sites-enabled/gitlab
sed 's/{{NGINX_PROXY_BUFFERING}}/'"${NGINX_PROXY_BUFFERING}"'/' -i /etc/nginx/sites-enabled/gitlab
sed 's/{{NGINX_PROXY_MAX_TEMP_FILE_SIZE}}/'"${NGINX_PROXY_MAX_TEMP_FILE_SIZE}"'/' -i /etc/nginx/sites-enabled/gitlab
sed 's/{{NGINX_ACCEL_BUFFERING}}/'"${NGINX_ACCEL_BUFFERING}"'/' -i /etc/nginx/sites-enabled/gitlab
if [ "${GITLAB_HTTPS_HSTS_ENABLED}" == "true" ]; then