@cryptotaxi247 / infra-1 / commits / 10758d98

import the other records, sort alphabetically

zimbatm committed Dec 19, 2018 at 20:49 UTC 10758d98778abc46df7cbf911baed757fc98f140
1 file changed +85 -40
terraform/route53.tf
+85 -40
@@ -21,7 +21,7 @@ resource "aws_route53_record" "nixos-mx" {
21 ]
22 }
23
24 -resource "aws_route53_record" "nixos-naked" {
24 +resource "aws_route53_record" "nixos-a" {
25 zone_id = "${aws_route53_zone.nixos.zone_id}"
26 name = ""
27 type = "A"
@@ -29,38 +29,39 @@ resource "aws_route53_record" "nixos-naked" {
29 records = ["${local.host_www}"]
30 }
31
32 -resource "aws_route53_record" "nixos-www" {
32 +resource "aws_route53_record" "nixos-bastion" {
33 zone_id = "${aws_route53_zone.nixos.zone_id}"
34 - name = "www"
34 + name = "bastion"
35 type = "A"
36 - ttl = "3600"
37 - records = ["${local.host_www}"]
36 + ttl = "600"
37 + records = ["${local.host_bastion}"]
38 }
39
40 -resource "aws_route53_record" "nixos-wild" {
40 +resource "aws_route53_record" "nixos-discourse" {
41 zone_id = "${aws_route53_zone.nixos.zone_id}"
42 - name = "*"
43 - type = "A"
42 + name = "discourse"
43 + type = "CNAME"
44 ttl = "3600"
45 - records = ["${local.host_www}"]
45 + records = ["nixos1.hosted-by-discourse.com"]
46 }
47
48 -resource "aws_route53_record" "nixos-planet" {
48 +resource "aws_route53_record" "nixos-cache" {
49 zone_id = "${aws_route53_zone.nixos.zone_id}"
50 - name = "planet"
51 - type = "A"
50 + name = "tarballs"
51 + type = "CNAME"
52 ttl = "3600"
53 - records = ["${local.host_www}"]
53 + records = ["dualstack.v2.shared.global.fastly.net"]
54 }
55
56 -resource "aws_route53_record" "nixos-status" {
56 +resource "aws_route53_record" "nixos-cache-verification" {
57 zone_id = "${aws_route53_zone.nixos.zone_id}"
58 - name = "status"
59 - type = "A"
60 - ttl = "3600"
61 - records = ["${local.host_status}"]
58 + name = "_d47a77b375708cea087182ee599174c0.cache"
59 + type = "CNAME"
60 + ttl = "600"
61 + records = ["_f437d0ffb520b017f4d72beb71afedf8.acm-validations.aws"]
62 }
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}"
67 name = "conf"
@@ -69,28 +70,36 @@ resource "aws_route53_record" "nixos-conf" {
70 records = ["nixconberlin.github.io"]
71 }
72
72 -resource "aws_route53_record" "nixos-weekly" {
73 +resource "aws_route53_record" "nixos-conf-wild" {
74 zone_id = "${aws_route53_zone.nixos.zone_id}"
74 - name = "weekly"
75 + name = "*.conf"
76 type = "CNAME"
77 ttl = "3600"
77 - records = ["nixos.github.io"]
78 + records = ["nixconberlin.github.io"]
79 }
80
80 -resource "aws_route53_record" "nixos-cache" {
81 +resource "aws_route53_record" "nixos-hydra-v4" {
82 zone_id = "${aws_route53_zone.nixos.zone_id}"
82 - name = "tarballs"
83 - type = "CNAME"
83 + name = "hydra"
84 + type = "A"
85 ttl = "3600"
85 - records = ["dualstack.v2.shared.global.fastly.net"]
86 + records = ["${local.host_chef}"]
87 }
88
88 -resource "aws_route53_record" "nixos-tarballs" {
89 +resource "aws_route53_record" "nixos-hydra-v6" {
90 zone_id = "${aws_route53_zone.nixos.zone_id}"
90 - name = "tarballs"
91 - type = "CNAME"
91 + name = "hydra"
92 + type = "AAAA"
93 ttl = "3600"
93 - records = ["d3am6xf9zisc71.cloudfront.net"]
94 + records = ["2a01:4f8:140:248f::"]
95 +}
96 +
97 +resource "aws_route53_record" "nixos-planet" {
98 + zone_id = "${aws_route53_zone.nixos.zone_id}"
99 + name = "planet"
100 + type = "A"
101 + ttl = "3600"
102 + records = ["${local.host_www}"]
103 }
104
105 resource "aws_route53_record" "nixos-releases" {
@@ -101,26 +110,62 @@ resource "aws_route53_record" "nixos-releases" {
110 records = ["d3g5gsiof5omrk.cloudfront.net."]
111 }
112
104 -resource "aws_route53_record" "nixos-bastion" {
113 +resource "aws_route53_record" "nixos-releases-verification" {
114 zone_id = "${aws_route53_zone.nixos.zone_id}"
106 - name = "bastion"
107 - type = "A"
115 + name = "_d8f6310f3e219676be295c56e7084ed2.releases"
116 + type = "CNAME"
117 ttl = "600"
109 - records = ["${local.host_bastion}"]
118 + records = ["_f66cc632b3b03a0f5493a406c535ad7d.acm-validations.aws"]
119 }
120
112 -resource "aws_route53_record" "nixos-hydra-v4" {
121 +resource "aws_route53_record" "nixos-status" {
122 zone_id = "${aws_route53_zone.nixos.zone_id}"
114 - name = "hydra"
123 + name = "status"
124 type = "A"
125 ttl = "3600"
117 - records = ["${local.host_chef}"]
126 + records = ["${local.host_status}"]
127 }
128
120 -resource "aws_route53_record" "nixos-hydra-v6" {
129 +resource "aws_route53_record" "nixos-tarballs" {
130 zone_id = "${aws_route53_zone.nixos.zone_id}"
122 - name = "hydra"
123 - type = "AAAA"
131 + name = "tarballs"
132 + type = "CNAME"
133 ttl = "3600"
125 - records = ["2a01:4f8:140:248f::"]
134 + records = ["d3am6xf9zisc71.cloudfront.net"]
135 +}
136 +
137 +resource "aws_route53_record" "nixos-tarballs-verification" {
138 + zone_id = "${aws_route53_zone.nixos.zone_id}"
139 + name = "_ea68264b3470fb78960575f8dda9b40b.tarballs"
140 + type = "CNAME"
141 + ttl = "600"
142 + records = ["_d7407b1e66c162385ea6816b6da86f00.acm-validations.aws"]
143 }
144 +
145 +resource "aws_route53_record" "nixos-weekly" {
146 + zone_id = "${aws_route53_zone.nixos.zone_id}"
147 + name = "weekly"
148 + type = "CNAME"
149 + ttl = "3600"
150 + records = ["nixos.github.io"]
151 +}
152 +
153 +resource "aws_route53_record" "nixos-weekly-wild" {
154 + zone_id = "${aws_route53_zone.nixos.zone_id}"
155 + name = "*.weekly"
156 + type = "CNAME"
157 + ttl = "3600"
158 + records = ["nixos.github.io"]
159 +}
160 +
161 +resource "aws_route53_record" "nixos-wild" {
162 + zone_id = "${aws_route53_zone.nixos.zone_id}"
163 + name = "*"
164 + type = "A"
165 + ttl = "3600"
166 + records = ["${local.host_www}"]
167 +}
168 +
169 +## Domain verification
170 +
171 +