diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-04 18:08:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-04 18:08:41 +0300 |
commit | 9ebfef6a3cf7184161c454c7667d151396e89137 (patch) | |
tree | a00337f95d0662c5d4433917ee04172ae82cc2de /doc/administration/uploads.md | |
parent | 8a9cbfa9c56792d8e338c289eb803fb0ebde2083 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/uploads.md')
-rw-r--r-- | doc/administration/uploads.md | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md index f0e126176b6..af2799098f4 100644 --- a/doc/administration/uploads.md +++ b/doc/administration/uploads.md @@ -39,16 +39,15 @@ Feature.disable(:upload_middleware_jwt_params_handler) ## Using local storage -NOTE: **Note:** -This is the default configuration - -To change the location where the uploads are stored locally, follow the steps -below. +This is the default configuration. To change the location where the uploads are +stored locally, use the steps in this section based on your installation method: -**In Omnibus installations:** +**In Omnibus GitLab installations:** NOTE: **Note:** -For historical reasons, uploads are stored into a base directory, which by default is `uploads/-/system`. It is strongly discouraged to change this configuration option on an existing GitLab installation. +For historical reasons, uploads are stored into a base directory, which by +default is `uploads/-/system`. It's strongly discouraged to change this +configuration option for an existing GitLab installation. _The uploads are stored by default in `/var/opt/gitlab/gitlab-rails/uploads`._ @@ -92,7 +91,6 @@ This configuration relies on valid AWS credentials to be configured already. [Read more about using object storage with GitLab](object_storage.md). -NOTE: **Note:** We recommend using the [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original configuration format. ## Object Storage Settings @@ -131,7 +129,6 @@ _The uploads are stored by default in } ``` - NOTE: **Note:** If you are using AWS IAM profiles, be sure to omit the AWS access key and secret access key/value pairs. ```ruby |