diff --git a/README.md b/README.md index fb77979c6..73b352049 100644 --- a/README.md +++ b/README.md @@ -944,6 +944,7 @@ Below is the complete list of available options that can be used to customize yo - **AWS_BACKUP_ACCESS_KEY_ID**: AWS access key id. No defaults. - **AWS_BACKUP_SECRET_ACCESS_KEY**: AWS secret access key. No defaults. - **AWS_BACKUP_BUCKET**: AWS bucket for backup uploads. No defaults. +- **AWS_BACKUP_MULTIPART_CHUNK_SIZE**: Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) - **GITLAB_ROBOTS_PATH**: Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples. - **RACK_ATTACK_ENABLED**: Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`. - **RACK_ATTACK_WHITELIST**: Always allow requests from whitelisted host. Defaults to `127.0.0.1` diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 9d0112a3b..f7abe7fed 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -137,6 +137,7 @@ AWS_BACKUP_REGION=${AWS_BACKUP_REGION} AWS_BACKUP_ACCESS_KEY_ID=${AWS_BACKUP_ACCESS_KEY_ID} AWS_BACKUP_SECRET_ACCESS_KEY=${AWS_BACKUP_SECRET_ACCESS_KEY} AWS_BACKUP_BUCKET=${AWS_BACKUP_BUCKET} +AWS_BACKUP_MULTIPART_CHUNK_SIZE=${AWS_BACKUP_MULTIPART_CHUNK_SIZE} ## NGINX NGINX_WORKERS=${NGINX_WORKERS:-1} diff --git a/assets/runtime/functions b/assets/runtime/functions index d0a41b363..1674fa626 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -702,7 +702,8 @@ gitlab_configure_backups_aws() { AWS_BACKUP_REGION \ AWS_BACKUP_ACCESS_KEY_ID \ AWS_BACKUP_SECRET_ACCESS_KEY \ - AWS_BACKUP_BUCKET + AWS_BACKUP_BUCKET \ + AWS_BACKUP_MULTIPART_CHUNK_SIZE ;; *) exec_as_git sed -i "/upload:/,/remote_directory:/d" ${GITLAB_CONFIG}