summaryrefslogtreecommitdiff
path: root/doc/raketasks
diff options
context:
space:
mode:
authorKai Kontio <kai.kontio@analyse2.com>2017-08-28 11:47:09 +0000
committerKai Kontio <kai.kontio@analyse2.com>2017-08-28 11:47:09 +0000
commitb7316ffdff561cc16a003c5540f2c6e627818a2e (patch)
tree5d0de51e89364b529b98d4807d25b42898f9d019 /doc/raketasks
parent1498baf7e94a06ed2048d571a6cdec61771513c2 (diff)
downloadgitlab-ce-b7316ffdff561cc16a003c5540f2c6e627818a2e.tar.gz
Update backup_restore.md documentation regarding S3 and IAM profiles.
https://gitlab.com/gitlab-org/gitlab-ce/commit/7f8ef19c411eceec207fef5d8459fbeaa40bf464 most likely broke the old configuration format where empty string aws_access_key_id & aws_secret_access_key were still OK. From 9.5 onwards moving backups to S3 using IAM profiles will fail if they are configured.
Diffstat (limited to 'doc/raketasks')
-rw-r--r--doc/raketasks/backup_restore.md5
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'
```