diff --git a/assets/init b/assets/init index cc4c311c..734a34db 100755 --- a/assets/init +++ b/assets/init @@ -44,6 +44,8 @@ GITLAB_BACKUP_TIME=${GITLAB_BACKUP_TIME:-04:00} GITLAB_BACKUP_EXPIRY=${GITLAB_BACKUP_EXPIRY:-} NGINX_WORKERS=${NGINX_WORKERS:-1} +NGINX_ACCEL_BUFFERING=${NGINX_ACCEL_BUFFERING:-no} +NGINX_PROXY_BUFFERING=${NGINX_PROXY_BUFFERING:-off} NGINX_MAX_UPLOAD_SIZE=${NGINX_MAX_UPLOAD_SIZE:-20m} GITLAB_MAX_SIZE=$(echo $NGINX_MAX_UPLOAD_SIZE |sed -e "s/^ *\([0-9]*\)[mMkKgG] *$/\1/g" ) case "$NGINX_MAX_UPLOAD_SIZE" in @@ -51,8 +53,6 @@ case "$NGINX_MAX_UPLOAD_SIZE" in *[mM] ) GITLAB_MAX_SIZE=$(($GITLAB_MAX_SIZE * 1048576));; *[gG] ) GITLAB_MAX_SIZE=$(($GITLAB_MAX_SIZE * 1073741824));; esac -NGINX_PROXY_BUFFERING=${NGINX_PROXY_BUFFERING:-off} -NGINX_ACCEL_BUFFERING=${NGINX_ACCEL_BUFFERING:-no} REDIS_HOST=${REDIS_HOST:-} REDIS_PORT=${REDIS_PORT:-} @@ -632,10 +632,10 @@ else fi sed 's/worker_processes .*/worker_processes '"${NGINX_WORKERS}"';/' -i /etc/nginx/nginx.conf -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_ACCEL_BUFFERING}}/'"${NGINX_ACCEL_BUFFERING}"'/' -i /etc/nginx/sites-enabled/gitlab +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 if [ "${GITLAB_HTTPS_HSTS_ENABLED}" == "true" ]; then sed 's/{{GITLAB_HTTPS_HSTS_MAXAGE}}/'"${GITLAB_HTTPS_HSTS_MAXAGE}"'/' -i /etc/nginx/sites-enabled/gitlab