summaryrefslogtreecommitdiff
path: root/doc/raketasks/backup_restore.md
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-30 12:03:44 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-30 12:03:44 +0200
commitb5d2d3d799ecc0bb036c3015ae47346cdf985df5 (patch)
treedbb280c89f640268ee5453bb0425fe1e02649e76 /doc/raketasks/backup_restore.md
parent794078a32a4f1048c28098bdfd122f0af46161df (diff)
downloadgitlab-ce-b5d2d3d799ecc0bb036c3015ae47346cdf985df5.tar.gz
Consolidate the IAM backup upload policy
Diffstat (limited to 'doc/raketasks/backup_restore.md')
-rw-r--r--doc/raketasks/backup_restore.md35
1 files changed, 10 insertions, 25 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 88a02acbc78..9318f0390f8 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -83,15 +83,15 @@ For installations from source:
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 three profiles, replacing `my.s3.bucket`
+uploading backups create the following IAM profile, replacing `my.s3.bucket`
with the name of your bucket:
```json
{
- "Version": "2014-09-29",
+ "Version": "2012-10-17",
"Statement": [
{
- "Sid": "Stmt1411994999",
+ "Sid": "Stmt1412062044000",
"Effect": "Allow",
"Action": [
"s3:AbortMultipartUpload",
@@ -99,42 +99,27 @@ with the name of your bucket:
"s3:GetBucketLocation",
"s3:GetObject",
"s3:GetObjectAcl",
- "s3:ListMultipartUploadParts",
+ "s3:ListBucketMultipartUploads",
"s3:PutObject",
"s3:PutObjectAcl"
],
"Resource": [
"arn:aws:s3:::my.s3.bucket/*"
]
- }
- ]
-}
-```
-
-```json
-{
- "Version": "2014-09-29",
- "Statement": [
+ },
{
- "Sid": "Stmt1411995081",
+ "Sid": "Stmt1412062097000",
"Effect": "Allow",
"Action": [
- "s3:ListAllMyBuckets", "s3:GetBucketLocation"
+ "s3:GetBucketLocation",
+ "s3:ListAllMyBuckets"
],
"Resource": [
"*"
]
- }
- ]
-}
-```
-
-```json
-{
- "Version": "2014-09-29",
- "Statement": [
+ },
{
- "Sid": "Stmt1411995608",
+ "Sid": "Stmt1412062128000",
"Effect": "Allow",
"Action": [
"s3:ListBucket"