From cb767d87c6835cbba631fd4eb68d0b0b905d0e23 Mon Sep 17 00:00:00 2001
From: Geoff Webster <gwebster@juniper.net>
Date: Fri, 19 Aug 2016 18:09:38 +0000
Subject: [PATCH 1/2] Document IAM Profile AWS S3 configuration key.
---
doc/raketasks/backup_restore.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 835af5443a3..68d946cfc63 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,12 +98,16 @@ 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
# encryption: 'AES256'
```
+
If you are uploading your backups to S3 you will probably want to create a new
IAM user with restricted access rights. To give the upload user access only for
uploading backups create the following IAM profile, replacing `my.s3.bucket`
--
GitLab
From 86b8d3d0f719a499d1c91878726e37d290be1147 Mon Sep 17 00:00:00 2001
From: Geoff Webster <gwebster@juniper.net>
Date: Fri, 19 Aug 2016 20:04:48 +0000
Subject: [PATCH 2/2] Remove whitespace.
---
doc/raketasks/backup_restore.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 68d946cfc63..3f4056dc440 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -107,7 +107,6 @@ For installations from source:
# encryption: 'AES256'
```
-
If you are uploading your backups to S3 you will probably want to create a new
IAM user with restricted access rights. To give the upload user access only for
uploading backups create the following IAM profile, replacing `my.s3.bucket`
--
GitLab