From eea0a43971fb319cf5386a266ce3daa10a683f0b Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 13 Apr 2015 16:55:42 +0530 Subject: [PATCH] nginx: removed proxy_max_temp_file_size configuration from vhost configuration --- assets/config/nginx/gitlab | 5 ++--- assets/config/nginx/gitlab-ssl | 1 - assets/init | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/assets/config/nginx/gitlab b/assets/config/nginx/gitlab index a4b19ff4..28f99c96 100644 --- a/assets/config/nginx/gitlab +++ b/assets/config/nginx/gitlab @@ -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; diff --git a/assets/config/nginx/gitlab-ssl b/assets/config/nginx/gitlab-ssl index 6ad5121c..ec131606 100644 --- a/assets/config/nginx/gitlab-ssl +++ b/assets/config/nginx/gitlab-ssl @@ -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; diff --git a/assets/init b/assets/init index 4bf7759f..05c60144 100755 --- a/assets/init +++ b/assets/init @@ -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