diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-08-30 12:54:19 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-08-30 12:54:19 +0000 |
| commit | f431543654f6150bb39b191e8ad9acc0ee651de4 (patch) | |
| tree | 0c64ca5e68cb7fca6e788b102a90281a9bc2d044 | |
| parent | fbab532fc19e6eb1736d7744f732f3a3a2002b29 (diff) | |
| parent | b7316ffdff561cc16a003c5540f2c6e627818a2e (diff) | |
| download | gitlab-ce-f431543654f6150bb39b191e8ad9acc0ee651de4.tar.gz | |
Merge branch 'patch-24' into 'master'
Update backup_restore.md documentation regarding S3 and IAM profiles.
See merge request !13871
| -rw-r--r-- | doc/raketasks/backup_restore.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 10f5ab3370d..ae69d7f92f2 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -144,9 +144,8 @@ 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' + # If using an IAM Profile, don't configure aws_access_key_id & aws_secret_access_key + # 'use_iam_profile' => true } gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket' ``` |