Fix deprecated stuff
Eelco Dolstra committed
Aug 27, 2021 at 14:24 UTC
bb7735266f12baa8f31dd1512feb821766f59881
6 files changed
+51
-52
terraform/cache.tf
+6
-6
@@ -1,5 +1,5 @@
1
resource "aws_s3_bucket" "cache" {
2
- provider = "aws.us"
2
+ provider = aws.us
3
bucket = "nix-cache"
4
5
lifecycle_rule {
@@ -20,8 +20,8 @@ resource "aws_s3_bucket" "cache" {
20
}
21
22
resource "aws_s3_bucket_policy" "cache" {
23
- provider = "aws.us"
24
- bucket = "${aws_s3_bucket.cache.id}"
23
+ provider = aws.us
24
+ bucket = aws_s3_bucket.cache.id
25
26
# imported from existing
27
policy = <<EOF
@@ -83,7 +83,7 @@ resource "aws_cloudfront_distribution" "cache" {
83
84
origin {
85
origin_id = "S3-nix-cache"
86
- domain_name = "${aws_s3_bucket.cache.bucket_domain_name}"
86
+ domain_name = aws_s3_bucket.cache.bucket_domain_name
87
88
s3_origin_config {
89
origin_access_identity = "origin-access-identity/cloudfront/E11I84008FX6W9"
@@ -110,7 +110,7 @@ resource "aws_cloudfront_distribution" "cache" {
110
111
viewer_certificate {
112
cloudfront_default_certificate = false
113
- acm_certificate_arn = "${aws_acm_certificate.cache.arn}"
113
+ acm_certificate_arn = aws_acm_certificate.cache.arn
114
ssl_support_method = "sni-only"
115
}
116
@@ -140,7 +140,7 @@ resource "aws_cloudfront_distribution" "cache" {
140
}
141
142
resource "aws_acm_certificate" "cache" {
143
- provider = "aws.us"
143
+ provider = aws.us
144
domain_name = "cache.nixos.org"
145
validation_method = "DNS"
146
terraform/channels.tf
+6
-6
@@ -1,5 +1,5 @@
1
resource "aws_s3_bucket" "channels" {
2
- provider = "aws.us"
2
+ provider = aws.us
3
bucket = "nix-channels"
4
5
website {
@@ -16,8 +16,8 @@ resource "aws_s3_bucket" "channels" {
16
}
17
18
resource "aws_s3_bucket_policy" "channels" {
19
- provider = "aws.us"
20
- bucket = "${aws_s3_bucket.channels.id}"
19
+ provider = aws.us
20
+ bucket = aws_s3_bucket.channels.id
21
policy = <<EOF
22
{
23
"Version": "2008-10-17",
@@ -72,7 +72,7 @@ resource "aws_cloudfront_distribution" "channels" {
72
73
origin {
74
origin_id = "default"
75
- domain_name = "${aws_s3_bucket.channels.website_endpoint}"
75
+ domain_name = aws_s3_bucket.channels.website_endpoint
76
77
custom_origin_config {
78
http_port = "80"
@@ -101,7 +101,7 @@ resource "aws_cloudfront_distribution" "channels" {
101
}
102
103
viewer_certificate {
104
- acm_certificate_arn = "${aws_acm_certificate.channels.arn}"
104
+ acm_certificate_arn = aws_acm_certificate.channels.arn
105
ssl_support_method = "sni-only"
106
}
107
@@ -117,7 +117,7 @@ resource "aws_cloudfront_distribution" "channels" {
117
}
118
119
resource "aws_acm_certificate" "channels" {
120
- provider = "aws.us"
120
+ provider = aws.us
121
domain_name = "channels.nixos.org"
122
validation_method = "DNS"
123
terraform/nixpkgs-tarballs-fastly.tf
+3
-3
@@ -9,14 +9,14 @@ locals {
9
resource "fastly_service_v1" "nixpkgs-tarballs" {
10
name = "nixpkgs-tarballs"
11
force_destroy = true
12
- default_host = "${local.tarballs_backend}"
12
+ default_host = local.tarballs_backend
13
14
domain {
15
- name = "${local.tarballs_domain}"
15
+ name = local.tarballs_domain
16
}
17
18
backend {
19
- address = "${local.tarballs_backend}"
19
+ address = local.tarballs_backend
20
name = "AWS S3 website"
21
22
# S3 websites don't binds on port 443
terraform/nixpkgs-tarballs.tf
+6
-7
@@ -7,7 +7,7 @@ resource "aws_s3_bucket" "nixpkgs-tarballs" {
7
}
8
9
resource "aws_s3_bucket_policy" "nixpkgs-tarballs" {
10
- bucket = "${aws_s3_bucket.nixpkgs-tarballs.id}"
10
+ bucket = aws_s3_bucket.nixpkgs-tarballs.id
11
12
# imported from existing
13
policy = <<EOF
@@ -134,9 +134,9 @@ EOF
134
}
135
136
resource "aws_s3_bucket_object" "nixpkgs-tarballs-index" {
137
- bucket = "${aws_s3_bucket.nixpkgs-tarballs.id}"
137
+ bucket = aws_s3_bucket.nixpkgs-tarballs.id
138
content_type = "text/html"
139
- etag = "${md5(file("${path.module}/nixpkgs-tarballs/index.html"))}"
139
+ etag = md5(file("${path.module}/nixpkgs-tarballs/index.html"))
140
key = "index.html"
141
source = "${path.module}/nixpkgs-tarballs/index.html"
142
}
@@ -154,7 +154,7 @@ resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
154
origin_id = "default"
155
domain_name = "nixpkgs-tarballs.s3-eu-west-1.amazonaws.com"
156
s3_origin_config {
157
- origin_access_identity = "${aws_cloudfront_origin_access_identity.nixpkgs-tarballs-identity.cloudfront_access_identity_path}"
157
+ origin_access_identity = aws_cloudfront_origin_access_identity.nixpkgs-tarballs-identity.cloudfront_access_identity_path
158
}
159
}
160
*/
@@ -190,7 +190,7 @@ resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
190
}
191
viewer_certificate {
192
cloudfront_default_certificate = false
193
- acm_certificate_arn = "${aws_acm_certificate.nixpkgs-tarballs.arn}"
193
+ acm_certificate_arn = aws_acm_certificate.nixpkgs-tarballs.arn
194
ssl_support_method = "sni-only"
195
}
196
restrictions {
@@ -204,7 +204,7 @@ resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
204
}
205
206
resource "aws_acm_certificate" "nixpkgs-tarballs" {
207
- provider = "aws.us"
207
+ provider = aws.us
208
domain_name = "tarballs.nixos.org"
209
validation_method = "DNS"
210
@@ -218,4 +218,3 @@ resource "aws_cloudfront_origin_access_identity" "nixpkgs-tarballs" {
218
comment = "Cloudfront identity for nixpkgs-tarballs"
219
}
220
*/
221
-
terraform/releases.tf
+5
-5
@@ -11,7 +11,7 @@ resource "aws_s3_bucket" "releases" {
11
}
12
13
resource "aws_s3_bucket_policy" "releases" {
14
- bucket = "${aws_s3_bucket.releases.id}"
14
+ bucket = aws_s3_bucket.releases.id
15
policy = <<EOF
16
{
17
"Version": "2008-10-17",
@@ -66,12 +66,12 @@ resource "aws_cloudfront_distribution" "releases" {
66
67
origin {
68
origin_id = "default"
69
- domain_name = "${aws_s3_bucket.releases.bucket_domain_name}"
69
+ domain_name = aws_s3_bucket.releases.bucket_domain_name
70
71
s3_origin_config {
72
origin_access_identity = ""
73
74
- #origin_access_identity = "${aws_cloudfront_origin_access_identity.releases.cloudfront_access_identity_path}"
74
+ #origin_access_identity = aws_cloudfront_origin_access_identity.releases.cloudfront_access_identity_path
75
}
76
}
77
@@ -95,7 +95,7 @@ resource "aws_cloudfront_distribution" "releases" {
95
96
viewer_certificate {
97
cloudfront_default_certificate = false
98
- acm_certificate_arn = "${aws_acm_certificate.releases.arn}"
98
+ acm_certificate_arn = aws_acm_certificate.releases.arn
99
ssl_support_method = "sni-only"
100
}
101
@@ -111,7 +111,7 @@ resource "aws_cloudfront_distribution" "releases" {
111
}
112
113
resource "aws_acm_certificate" "releases" {
114
- provider = "aws.us"
114
+ provider = aws.us
115
domain_name = "releases.nixos.org"
116
validation_method = "DNS"
117
terraform/route53.tf
+25
-25
@@ -10,7 +10,7 @@ resource "aws_route53_zone" "nixos" {
10
}
11
12
resource "aws_route53_record" "nixos-mx" {
13
- zone_id = "${aws_route53_zone.nixos.zone_id}"
13
+ zone_id = aws_route53_zone.nixos.zone_id
14
name = ""
15
type = "MX"
16
ttl = "14300"
@@ -22,23 +22,23 @@ resource "aws_route53_record" "nixos-mx" {
22
}
23
24
resource "aws_route53_record" "nixos-a" {
25
- zone_id = "${aws_route53_zone.nixos.zone_id}"
25
+ zone_id = aws_route53_zone.nixos.zone_id
26
name = ""
27
type = "A"
28
ttl = "500"
29
- records = ["${local.host_www}"]
29
+ records = [local.host_www]
30
}
31
32
resource "aws_route53_record" "nixos-bastion" {
33
- zone_id = "${aws_route53_zone.nixos.zone_id}"
33
+ zone_id = aws_route53_zone.nixos.zone_id
34
name = "bastion"
35
type = "A"
36
ttl = "600"
37
- records = ["${local.host_bastion}"]
37
+ records = [local.host_bastion]
38
}
39
40
resource "aws_route53_record" "nixos-discourse" {
41
- zone_id = "${aws_route53_zone.nixos.zone_id}"
41
+ zone_id = aws_route53_zone.nixos.zone_id
42
name = "discourse"
43
type = "CNAME"
44
ttl = "3600"
@@ -46,7 +46,7 @@ resource "aws_route53_record" "nixos-discourse" {
46
}
47
48
resource "aws_route53_record" "nixos-cache" {
49
- zone_id = "${aws_route53_zone.nixos.zone_id}"
49
+ zone_id = aws_route53_zone.nixos.zone_id
50
name = "cache"
51
type = "CNAME"
52
ttl = "3600"
@@ -54,7 +54,7 @@ resource "aws_route53_record" "nixos-cache" {
54
}
55
56
resource "aws_route53_record" "nixos-cache-verification" {
57
- zone_id = "${aws_route53_zone.nixos.zone_id}"
57
+ zone_id = aws_route53_zone.nixos.zone_id
58
name = "_d47a77b375708cea087182ee599174c0.cache"
59
type = "CNAME"
60
ttl = "600"
@@ -63,7 +63,7 @@ resource "aws_route53_record" "nixos-cache-verification" {
63
64
# NOTE: this should be moved to the nixcon.org domain
65
resource "aws_route53_record" "nixos-conf" {
66
- zone_id = "${aws_route53_zone.nixos.zone_id}"
66
+ zone_id = aws_route53_zone.nixos.zone_id
67
name = "conf"
68
type = "CNAME"
69
ttl = "3600"
@@ -71,7 +71,7 @@ resource "aws_route53_record" "nixos-conf" {
71
}
72
73
resource "aws_route53_record" "nixos-conf-wild" {
74
- zone_id = "${aws_route53_zone.nixos.zone_id}"
74
+ zone_id = aws_route53_zone.nixos.zone_id
75
name = "*.conf"
76
type = "CNAME"
77
ttl = "3600"
@@ -79,15 +79,15 @@ resource "aws_route53_record" "nixos-conf-wild" {
79
}
80
81
resource "aws_route53_record" "nixos-hydra-v4" {
82
- zone_id = "${aws_route53_zone.nixos.zone_id}"
82
+ zone_id = aws_route53_zone.nixos.zone_id
83
name = "hydra"
84
type = "A"
85
ttl = "3600"
86
- records = ["${local.host_chef}"]
86
+ records = [local.host_chef]
87
}
88
89
resource "aws_route53_record" "nixos-hydra-v6" {
90
- zone_id = "${aws_route53_zone.nixos.zone_id}"
90
+ zone_id = aws_route53_zone.nixos.zone_id
91
name = "hydra"
92
type = "AAAA"
93
ttl = "3600"
@@ -95,15 +95,15 @@ resource "aws_route53_record" "nixos-hydra-v6" {
95
}
96
97
resource "aws_route53_record" "nixos-planet" {
98
- zone_id = "${aws_route53_zone.nixos.zone_id}"
98
+ zone_id = aws_route53_zone.nixos.zone_id
99
name = "planet"
100
type = "A"
101
ttl = "3600"
102
- records = ["${local.host_www}"]
102
+ records = [local.host_www]
103
}
104
105
resource "aws_route53_record" "nixos-releases" {
106
- zone_id = "${aws_route53_zone.nixos.zone_id}"
106
+ zone_id = aws_route53_zone.nixos.zone_id
107
name = "releases"
108
type = "CNAME"
109
ttl = "3600"
@@ -111,7 +111,7 @@ resource "aws_route53_record" "nixos-releases" {
111
}
112
113
resource "aws_route53_record" "nixos-releases-verification" {
114
- zone_id = "${aws_route53_zone.nixos.zone_id}"
114
+ zone_id = aws_route53_zone.nixos.zone_id
115
name = "_d8f6310f3e219676be295c56e7084ed2.releases"
116
type = "CNAME"
117
ttl = "600"
@@ -119,15 +119,15 @@ resource "aws_route53_record" "nixos-releases-verification" {
119
}
120
121
resource "aws_route53_record" "nixos-status" {
122
- zone_id = "${aws_route53_zone.nixos.zone_id}"
122
+ zone_id = aws_route53_zone.nixos.zone_id
123
name = "status"
124
type = "A"
125
ttl = "3600"
126
- records = ["${local.host_status}"]
126
+ records = [local.host_status]
127
}
128
129
resource "aws_route53_record" "nixos-tarballs" {
130
- zone_id = "${aws_route53_zone.nixos.zone_id}"
130
+ zone_id = aws_route53_zone.nixos.zone_id
131
name = "tarballs"
132
type = "CNAME"
133
ttl = "3600"
@@ -135,7 +135,7 @@ resource "aws_route53_record" "nixos-tarballs" {
135
}
136
137
resource "aws_route53_record" "nixos-tarballs-verification" {
138
- zone_id = "${aws_route53_zone.nixos.zone_id}"
138
+ zone_id = aws_route53_zone.nixos.zone_id
139
name = "_ea68264b3470fb78960575f8dda9b40b.tarballs"
140
type = "CNAME"
141
ttl = "600"
@@ -143,7 +143,7 @@ resource "aws_route53_record" "nixos-tarballs-verification" {
143
}
144
145
resource "aws_route53_record" "nixos-weekly" {
146
- zone_id = "${aws_route53_zone.nixos.zone_id}"
146
+ zone_id = aws_route53_zone.nixos.zone_id
147
name = "weekly"
148
type = "CNAME"
149
ttl = "3600"
@@ -151,7 +151,7 @@ resource "aws_route53_record" "nixos-weekly" {
151
}
152
153
resource "aws_route53_record" "nixos-weekly-wild" {
154
- zone_id = "${aws_route53_zone.nixos.zone_id}"
154
+ zone_id = aws_route53_zone.nixos.zone_id
155
name = "*.weekly"
156
type = "CNAME"
157
ttl = "3600"
@@ -159,9 +159,9 @@ resource "aws_route53_record" "nixos-weekly-wild" {
159
}
160
161
#resource "aws_route53_record" "nixos-wild" {
162
-# zone_id = "${aws_route53_zone.nixos.zone_id}"
162
+# zone_id = aws_route53_zone.nixos.zone_id
163
# name = "*"
164
# type = "A"
165
# ttl = "3600"
166
-# records = ["${local.host_www}"]
166
+# records = [local.host_www]
167
#}