diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-01-29 07:04:18 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-01-29 07:04:18 +0000 |
| commit | 60963eac0599fd8210c3a2e38fa887a75dfb8530 (patch) | |
| tree | 30a49202ddaeaba4e84c245c81b625d85a7fcc44 | |
| parent | dc325c672e20afa953117b0e1b04b2e399f391d7 (diff) | |
| parent | e0c363ca01575d9d5d04b3fe285d399d69d5a3ca (diff) | |
| download | gitlab-ce-60963eac0599fd8210c3a2e38fa887a75dfb8530.tar.gz | |
Merge branch 'sh-digital-ocean-s3-docs' into 'master'
Digital Ocean Spaces now supports AWS v4 streaming API
See merge request gitlab-org/gitlab-ce!16745
| -rw-r--r-- | doc/raketasks/backup_restore.md | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 76f33b765d3..24d678d5cde 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -169,15 +169,11 @@ For Omnibus GitLab packages: 1. [Reconfigure GitLab] for the changes to take effect -#### Digital Ocean Spaces and other S3-compatible providers +#### Digital Ocean Spaces -Not all S3 providers are fully-compatible with the Fog library. For example, -if you see `411 Length Required` errors after attempting to upload, you may -need to downgrade the `aws_signature_version` value from the default value to -2 [due to this issue](https://github.com/fog/fog-aws/issues/428). +This example can be used for a bucket in Amsterdam (AMS3). -1. For example, with [Digital Ocean Spaces](https://www.digitalocean.com/products/spaces/), -this example configuration can be used for a bucket in Amsterdam (AMS3): +1. Add the following to `/etc/gitlab/gitlab.rb`: ```ruby gitlab_rails['backup_upload_connection'] = { @@ -185,7 +181,6 @@ this example configuration can be used for a bucket in Amsterdam (AMS3): 'region' => 'ams3', 'aws_access_key_id' => 'AKIAKIAKI', 'aws_secret_access_key' => 'secret123', - 'aws_signature_version' => 2, 'endpoint' => 'https://ams3.digitaloceanspaces.com' } gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket' @@ -193,6 +188,13 @@ this example configuration can be used for a bucket in Amsterdam (AMS3): 1. [Reconfigure GitLab] for the changes to take effect +#### Other S3 Providers + +Not all S3 providers are fully-compatible with the Fog library. For example, +if you see `411 Length Required` errors after attempting to upload, you may +need to downgrade the `aws_signature_version` value from the default value to +2 [due to this issue](https://github.com/fog/fog-aws/issues/428). + --- For installations from source: |