Commit 60963eac authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

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
parents dc325c67 e0c363ca
...@@ -169,15 +169,11 @@ For Omnibus GitLab packages: ...@@ -169,15 +169,11 @@ For Omnibus GitLab packages:
1. [Reconfigure GitLab] for the changes to take effect 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, This example can be used for a bucket in Amsterdam (AMS3).
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).
1. For example, with [Digital Ocean Spaces](https://www.digitalocean.com/products/spaces/), 1. Add the following to `/etc/gitlab/gitlab.rb`:
this example configuration can be used for a bucket in Amsterdam (AMS3):
```ruby ```ruby
gitlab_rails['backup_upload_connection'] = { gitlab_rails['backup_upload_connection'] = {
...@@ -185,7 +181,6 @@ this example configuration can be used for a bucket in Amsterdam (AMS3): ...@@ -185,7 +181,6 @@ this example configuration can be used for a bucket in Amsterdam (AMS3):
'region' => 'ams3', 'region' => 'ams3',
'aws_access_key_id' => 'AKIAKIAKI', 'aws_access_key_id' => 'AKIAKIAKI',
'aws_secret_access_key' => 'secret123', 'aws_secret_access_key' => 'secret123',
'aws_signature_version' => 2,
'endpoint' => 'https://ams3.digitaloceanspaces.com' 'endpoint' => 'https://ams3.digitaloceanspaces.com'
} }
gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket' 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): ...@@ -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 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: For installations from source:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment