diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-09 07:16:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-09 07:16:43 +0000 |
| commit | 70b3fde64096fa1eda9f5a2e1e54bc0cfd609909 (patch) | |
| tree | fec2e50a29ebf12324fd38ba85715afe5287c3b7 /config | |
| parent | 0ed8f3490e037d451841ec0e6fe226b9e62e8466 (diff) | |
| parent | e5553ce6f05f9fad575036edd321161689eaefaa (diff) | |
| download | gitlab-ce-70b3fde64096fa1eda9f5a2e1e54bc0cfd609909.tar.gz | |
Merge branch 'rjh/additional-options-for-s3-compatible-hosts' into 'master'
Add options to adjust signed url creation for Object Storage to use older signature if needed.
See merge request gitlab-org/gitlab-ce!18719
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e0779112850..ab109f5d04f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -160,6 +160,9 @@ production: &base # aws_access_key_id: AWS_ACCESS_KEY_ID # aws_secret_access_key: AWS_SECRET_ACCESS_KEY # region: us-east-1 + # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. + # endpoint: 'https://s3.amazonaws.com' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces + ## Git LFS lfs: @@ -180,6 +183,7 @@ production: &base # Use the following options to configure an AWS compatible host # host: 'localhost' # default: s3.amazonaws.com # endpoint: 'http://127.0.0.1:9000' # default: nil + # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' ## Uploads (attachments, avatars, etc...) @@ -197,6 +201,7 @@ production: &base provider: AWS aws_access_key_id: AWS_ACCESS_KEY_ID aws_secret_access_key: AWS_SECRET_ACCESS_KEY + aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. region: us-east-1 # host: 'localhost' # default: s3.amazonaws.com # endpoint: 'http://127.0.0.1:9000' # default: nil |