summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPaul Beattie <paul@paul-beattie.com>2015-09-10 16:57:43 +0100
committerPaul Beattie <paul@paul-beattie.com>2015-09-25 17:06:31 +0100
commit253d2320ab3d3473509d6abe4a62be90428f20c4 (patch)
tree4d30261c81ddb3e93f70b12101701735ed033844 /doc
parentb623391720e2687ca88c6bf1166ee571d85807fa (diff)
downloadgitlab-ce-253d2320ab3d3473509d6abe4a62be90428f20c4.tar.gz
Add support for AWS S3 Server-Side Encryption support
This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. This is optional and not required to make S3 uploads work.
Diffstat (limited to 'doc')
-rw-r--r--doc/raketasks/backup_restore.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 4ff5e74d438..b212964436f 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -95,6 +95,8 @@ For installations from source:
aws_secret_access_key: 'secret123'
# The remote 'directory' to store your backups. For S3, this would be the bucket name.
remote_directory: 'my.s3.bucket'
+ # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional
+ # encryption: 'AES256'
```
If you are uploading your backups to S3 you will probably want to create a new