Make the releases bucket listable again
Also, serve index.html from cloudfront.
Eelco Dolstra committed
Feb 27, 2020 at 17:14 UTC
1a54547f592b531b38e0744951a45770382e9cda
1 file changed
+10
-25
terraform/releases.tf
+10
-25
@@ -26,34 +26,19 @@ resource "aws_s3_bucket_policy" "releases" {
26
"Resource": "arn:aws:s3:::nix-releases/*"
27
},
28
{
29
- "Sid": "AllowUploadDebuginfoWrite",
29
+ "Sid": "AllowPublicList",
30
"Effect": "Allow",
31
"Principal": {
32
- "AWS": [
33
- "arn:aws:iam::080433136561:user/s3-upload-releases",
34
- "arn:aws:iam::065343343465:user/nixos-s3-upload-releases"
35
- ]
32
+ "AWS": "*"
33
},
34
"Action": [
38
- "s3:PutObject",
39
- "s3:PutObjectAcl"
35
+ "s3:ListBucket",
36
+ "s3:GetBucketLocation"
37
],
41
- "Resource": "arn:aws:s3:::nix-releases/*"
42
- },
43
- {
44
- "Sid": "AllowUploadDebuginfoRead",
45
- "Effect": "Allow",
46
- "Principal": {
47
- "AWS": [
48
- "arn:aws:iam::080433136561:user/s3-upload-releases",
49
- "arn:aws:iam::065343343465:user/nixos-s3-upload-releases"
50
- ]
51
- },
52
- "Action": "s3:GetObject",
53
- "Resource": "arn:aws:s3:::nix-releases/*"
38
+ "Resource": "arn:aws:s3:::nix-releases"
39
},
40
{
56
- "Sid": "AllowUploadDebuginfoRead2",
41
+ "Sid": "AllowUpload",
42
"Effect": "Allow",
43
"Principal": {
44
"AWS": [
@@ -62,10 +47,10 @@ resource "aws_s3_bucket_policy" "releases" {
47
]
48
},
49
"Action": [
65
- "s3:ListBucket",
66
- "s3:GetBucketLocation"
50
+ "s3:PutObject",
51
+ "s3:PutObjectAcl"
52
],
68
- "Resource": "arn:aws:s3:::nix-releases"
53
+ "Resource": "arn:aws:s3:::nix-releases/*"
54
}
55
]
56
}
@@ -77,6 +62,7 @@ resource "aws_cloudfront_distribution" "releases" {
62
is_ipv6_enabled = true
63
price_class = "PriceClass_All"
64
aliases = ["releases.nixos.org"]
65
+ default_root_object = "index.html"
66
67
origin {
68
origin_id = "default"
@@ -139,4 +125,3 @@ resource "aws_cloudfront_origin_access_identity" "releases" {
125
comment = "Cloudfront identity for releases"
126
}
127
*/
142
-