terraform: run `terraform fmt`
zimbatm committed
Oct 4, 2018 at 12:51 UTC
8b86fce0838c9b5db411a8a4bf1b1cce7cffdefa
4 files changed
+36
-34
terraform/cache.tf
+12
-11
@@ -1,12 +1,13 @@
1
resource "aws_cloudfront_distribution" "cache" {
2
- enabled = true
3
- is_ipv6_enabled = true
4
- price_class = "PriceClass_All"
5
- aliases = ["cache.nixos.org"]
2
+ enabled = true
3
+ is_ipv6_enabled = true
4
+ price_class = "PriceClass_All"
5
+ aliases = ["cache.nixos.org"]
6
7
origin {
8
origin_id = "S3-nix-cache"
9
domain_name = "nix-cache.s3.amazonaws.com"
10
+
11
s3_origin_config {
12
origin_access_identity = "origin-access-identity/cloudfront/E11I84008FX6W9"
13
}
@@ -32,8 +33,8 @@ resource "aws_cloudfront_distribution" "cache" {
33
34
viewer_certificate {
35
cloudfront_default_certificate = true
35
- acm_certificate_arn = "${aws_acm_certificate.cache.arn}"
36
- ssl_support_method = "sni-only"
36
+ acm_certificate_arn = "${aws_acm_certificate.cache.arn}"
37
+ ssl_support_method = "sni-only"
38
}
39
40
restrictions {
@@ -47,14 +48,14 @@ resource "aws_cloudfront_distribution" "cache" {
48
}
49
50
custom_error_response {
50
- error_code = 403
51
- response_page_path = "/error-pages/404"
52
- response_code = 404
51
+ error_code = 403
52
+ response_page_path = "/error-pages/404"
53
+ response_code = 404
54
error_caching_min_ttl = 600
55
}
56
57
custom_error_response {
57
- error_code = 500
58
+ error_code = 500
59
error_caching_min_ttl = 10
60
}
61
@@ -62,7 +63,7 @@ resource "aws_cloudfront_distribution" "cache" {
63
}
64
65
resource "aws_acm_certificate" "cache" {
65
- provider = "aws.us"
66
+ provider = "aws.us"
67
domain_name = "cache.nixos.org"
68
validation_method = "DNS"
69
terraform/nixpkgs-tarballs.tf
+13
-15
@@ -1,8 +1,8 @@
1
resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
2
- enabled = true
3
- is_ipv6_enabled = true
4
- price_class = "PriceClass_All"
5
- aliases = ["tarballs.nixos.org"]
2
+ enabled = true
3
+ is_ipv6_enabled = true
4
+ price_class = "PriceClass_All"
5
+ aliases = ["tarballs.nixos.org"]
6
7
# Urgh, can't use an S3 origin because it's configured as a website
8
# (to serve HTTP redirects).
@@ -19,14 +19,14 @@ resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
19
origin {
20
origin_id = "default"
21
domain_name = "nixpkgs-tarballs.s3-website-eu-west-1.amazonaws.com"
22
+
23
custom_origin_config {
23
- http_port = 80
24
- https_port = 443
24
+ http_port = 80
25
+ https_port = 443
26
origin_protocol_policy = "http-only"
26
- origin_ssl_protocols = ["TLSv1.2"]
27
+ origin_ssl_protocols = ["TLSv1.2"]
28
}
29
}
29
-
30
default_cache_behavior {
31
allowed_methods = ["HEAD", "GET"]
32
cached_methods = ["HEAD", "GET"]
@@ -44,26 +44,23 @@ resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
44
}
45
}
46
}
47
-
47
viewer_certificate {
48
cloudfront_default_certificate = true
50
- acm_certificate_arn = "${aws_acm_certificate.nixpkgs-tarballs.arn}"
51
- ssl_support_method = "sni-only"
49
+ acm_certificate_arn = "${aws_acm_certificate.nixpkgs-tarballs.arn}"
50
+ ssl_support_method = "sni-only"
51
}
53
-
52
restrictions {
53
geo_restriction {
54
restriction_type = "none"
55
}
56
}
59
-
57
logging_config {
58
bucket = "nix-cache-logs.s3.amazonaws.com"
59
}
60
}
61
62
resource "aws_acm_certificate" "nixpkgs-tarballs" {
66
- provider = "aws.us"
63
+ provider = "aws.us"
64
domain_name = "tarballs.nixos.org"
65
validation_method = "DNS"
66
@@ -76,4 +73,5 @@ resource "aws_acm_certificate" "nixpkgs-tarballs" {
73
resource "aws_cloudfront_origin_access_identity" "nixpkgs-tarballs" {
74
comment = "Cloudfront identity for nixpkgs-tarballs"
75
}
79
-*/
\ No newline at end of file
76
+*/
77
+
terraform/providers.tf
+1
-1
@@ -3,6 +3,6 @@ provider "aws" {
3
}
4
5
provider "aws" {
6
- alias = "us"
6
+ alias = "us"
7
region = "us-east-1"
8
}
terraform/releases.tf
+10
-7
@@ -1,14 +1,16 @@
1
resource "aws_cloudfront_distribution" "releases" {
2
- enabled = true
3
- is_ipv6_enabled = true
4
- price_class = "PriceClass_All"
5
- aliases = ["releases.nixos.org"]
2
+ enabled = true
3
+ is_ipv6_enabled = true
4
+ price_class = "PriceClass_All"
5
+ aliases = ["releases.nixos.org"]
6
7
origin {
8
origin_id = "default"
9
domain_name = "nix-releases.s3.amazonaws.com"
10
+
11
s3_origin_config {
12
origin_access_identity = ""
13
+
14
#origin_access_identity = "${aws_cloudfront_origin_access_identity.releases.cloudfront_access_identity_path}"
15
}
16
}
@@ -33,8 +35,8 @@ resource "aws_cloudfront_distribution" "releases" {
35
36
viewer_certificate {
37
cloudfront_default_certificate = true
36
- acm_certificate_arn = "${aws_acm_certificate.releases.arn}"
37
- ssl_support_method = "sni-only"
38
+ acm_certificate_arn = "${aws_acm_certificate.releases.arn}"
39
+ ssl_support_method = "sni-only"
40
}
41
42
restrictions {
@@ -49,7 +51,7 @@ resource "aws_cloudfront_distribution" "releases" {
51
}
52
53
resource "aws_acm_certificate" "releases" {
52
- provider = "aws.us"
54
+ provider = "aws.us"
55
domain_name = "releases.nixos.org"
56
validation_method = "DNS"
57
@@ -63,3 +65,4 @@ resource "aws_cloudfront_origin_access_identity" "releases" {
65
comment = "Cloudfront identity for releases"
66
}
67
*/
68
+