diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-17 19:05:52 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-17 19:05:52 +0000 |
| commit | 2caa6f78b790ca2ed45be3fa9bd049773597dc73 (patch) | |
| tree | b3295cdc0c854f99a4f1492dade110a0dedc9d8a /doc | |
| parent | d38499b3a785ea9d15cb3f108764d20016ea8ea7 (diff) | |
| parent | 86b8d3d0f719a499d1c91878726e37d290be1147 (diff) | |
| download | gitlab-ce-2caa6f78b790ca2ed45be3fa9bd049773597dc73.tar.gz | |
Merge branch 'patch-3' into 'master'
Document IAM Profile AWS S3 configuration key.
## What does this MR do?
Document additional parameters available to the backup rake job configuration.
## Are there points in the code the reviewer needs to double check?
Probably not.
## Why was this MR needed?
Un-documented configuration options
## What are the relevant issue numbers?
#12756
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5910
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/raketasks/backup_restore.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 835af5443a3..3f4056dc440 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -79,6 +79,9 @@ gitlab_rails['backup_upload_connection'] = { 'region' => 'eu-west-1', 'aws_access_key_id' => 'AKIAKIAKI', 'aws_secret_access_key' => 'secret123' + # If using an IAM Profile, leave aws_access_key_id & aws_secret_access_key empty + # ie. 'aws_access_key_id' => '', + # 'use_iam_profile' => 'true' } gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket' ``` @@ -95,6 +98,9 @@ For installations from source: region: eu-west-1 aws_access_key_id: AKIAKIAKI aws_secret_access_key: 'secret123' + # If using an IAM Profile, leave aws_access_key_id & aws_secret_access_key empty + # ie. aws_access_key_id: '' + # use_iam_profile: 'true' # 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 |