diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-08-30 12:54:19 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-01 13:34:59 -0500 |
| commit | 894526e36bc1914cc94047d0f8a718ff1cab909b (patch) | |
| tree | ac7d37a8edf734384197aed8f519819e2cc31711 /doc | |
| parent | 628d0b5c7a46aa556decfb744983feedb62e996e (diff) | |
| download | gitlab-ce-894526e36bc1914cc94047d0f8a718ff1cab909b.tar.gz | |
Merge branch 'patch-24' into 'master'
Update backup_restore.md documentation regarding S3 and IAM profiles.
See merge request !13871
Diffstat (limited to 'doc')
| -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' ``` |