From 59238a96c2bd9ab1d310a91df3e164934e8bb85e Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sun, 20 Dec 2015 14:08:33 +0530
Subject: [PATCH] removed `NGINX_MAX_UPLOAD_SIZE` configuration parameter

---
 Changelog.md                |  1 +
 README.md                   |  1 -
 assets/runtime/env-defaults | 29 +++++++++++++----------------
 assets/runtime/functions    |  1 -
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3818b804..748e75b3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab-workhorse: upgrade to v0.5.1
 - gitlab: upgrade to CE v8.3.0
 - expose `GITLAB_MAX_OBJECT_SIZE` configuration parameter
+- removed `NGINX_MAX_UPLOAD_SIZE` configuration parameter
 
 **8.2.3**
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
diff --git a/README.md b/README.md
index 924d2f47..c42a64d0 100644
--- a/README.md
+++ b/README.md
@@ -799,7 +799,6 @@ Below is the complete list of available options that can be used to customize yo
 - **NGINX_HSTS_MAXAGE**: Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`.
 - **NGINX_PROXY_BUFFERING**: Enable `proxy_buffering`. Defaults to `off`.
 - **NGINX_ACCEL_BUFFERING**: Enable `X-Accel-Buffering` header. Default to `no`
-- **NGINX_MAX_UPLOAD_SIZE**: Maximum acceptable upload size. Defaults to `20m`.
 - **NGINX_X_FORWARDED_PROTO**: Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`.
 - **REDIS_HOST**: The hostname of the redis server. Defaults to `localhost`
 - **REDIS_PORT**: The connection port of the redis server. Defaults to `6379`.
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index afb86456..22b6773c 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -78,6 +78,19 @@ fi
 
 GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10}
 GITLAB_TIMEOUT=${GITLAB_TIMEOUT:-10}
+GITLAB_MAX_OBJECT_SIZE=${GITLAB_MAX_OBJECT_SIZE:-}
+if [[ -z ${GITLAB_MAX_OBJECT_SIZE} ]]; then
+  if [[ -n ${NGINX_MAX_UPLOAD_SIZE} ]]; then # backward compatibility
+    GITLAB_MAX_OBJECT_SIZE=$(echo $NGINX_MAX_UPLOAD_SIZE |sed -e "s/^ *\([0-9]*\)[mMkKgG] *$/\1/g")
+    case ${NGINX_MAX_UPLOAD_SIZE} in
+      *[kK] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1024));;
+      *[mM] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1048576));;
+      *[gG] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1073741824));;
+    esac
+  else
+    GITLAB_MAX_OBJECT_SIZE=${GITLAB_MAX_OBJECT_SIZE:-20971520}
+  fi
+fi
 
 ## ARTIFACTS
 GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true}
@@ -126,22 +139,6 @@ AWS_BACKUP_BUCKET=${AWS_BACKUP_BUCKET}
 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_OBJECT_SIZE=${GITLAB_MAX_OBJECT_SIZE:-}
-if [[ -z ${GITLAB_MAX_OBJECT_SIZE} ]]; then
-  if [[ -n ${NGINX_MAX_UPLOAD_SIZE} ]]; then
-    GITLAB_MAX_OBJECT_SIZE=$(echo $NGINX_MAX_UPLOAD_SIZE |sed -e "s/^ *\([0-9]*\)[mMkKgG] *$/\1/g")
-    case ${NGINX_MAX_UPLOAD_SIZE} in
-      *[kK] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1024));;
-      *[mM] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1048576));;
-      *[gG] ) GITLAB_MAX_OBJECT_SIZE=$(($GITLAB_MAX_OBJECT_SIZE * 1073741824));;
-    esac
-  else
-    GITLAB_MAX_OBJECT_SIZE=${GITLAB_MAX_OBJECT_SIZE:-20971520}
-  fi
-fi
-
 case ${GITLAB_HTTPS} in
   true) NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-https} ;;
   *)    NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-\$scheme} ;;
diff --git a/assets/runtime/functions b/assets/runtime/functions
index ed8ff83f..5c7f7cb1 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -748,7 +748,6 @@ nginx_configure_gitlab() {
     GITLAB_PORT \
     NGINX_PROXY_BUFFERING \
     NGINX_ACCEL_BUFFERING \
-    NGINX_MAX_UPLOAD_SIZE \
     NGINX_X_FORWARDED_PROTO
 
   nginx_configure_gitlab_ssl