From 6c70ddf4ec8367e433e097f0edd02b01398d5e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Tue, 23 Apr 2024 15:07:05 +0200 Subject: [PATCH] Point 1,2.th.ooni.org to the AWS instances --- tf/environments/prod/dns_records.tf | 34 ----------------------------- tf/environments/prod/main.tf | 2 ++ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/tf/environments/prod/dns_records.tf b/tf/environments/prod/dns_records.tf index ca872c5f..cc2467e0 100644 --- a/tf/environments/prod/dns_records.tf +++ b/tf/environments/prod/dns_records.tf @@ -1005,37 +1005,3 @@ resource "aws_route53_record" "test-ooni-nu-_NS_" { type = "NS" zone_id = local.dns_root_zone_ooni_nu } - -## Records for the th.ooni.org zone - -resource "aws_route53_record" "_2-th-ooni-org-_A_" { - name = "2.th.ooni.org" - records = ["161.35.89.250"] - ttl = "60" - type = "A" - zone_id = local.dns_root_zone_ooni_org -} - -resource "aws_route53_record" "_2-th-ooni-org-_AAAA_" { - name = "2.th.ooni.org" - records = ["2a03:b0c0:2:d0::1768:9001"] - ttl = "60" - type = "AAAA" - zone_id = local.dns_root_zone_ooni_org -} - -resource "aws_route53_record" "_1-th-ooni-org-_A_" { - name = "1.th.ooni.org" - records = ["161.35.89.250"] - ttl = "60" - type = "A" - zone_id = local.dns_root_zone_ooni_org -} - -resource "aws_route53_record" "_1-th-ooni-org-_AAAA_" { - name = "1.th.ooni.org" - records = ["2a03:b0c0:2:d0::1768:9001"] - ttl = "60" - type = "AAAA" - zone_id = local.dns_root_zone_ooni_org -} diff --git a/tf/environments/prod/main.tf b/tf/environments/prod/main.tf index f572f467..a46fbbad 100644 --- a/tf/environments/prod/main.tf +++ b/tf/environments/prod/main.tf @@ -552,6 +552,8 @@ module "oonith_oohelperd" { alternative_names = { "0.th.ooni.org" = local.dns_root_zone_ooni_org, + "1.th.ooni.org" = local.dns_root_zone_ooni_org, + "2.th.ooni.org" = local.dns_root_zone_ooni_org, "3.th.ooni.org" = local.dns_root_zone_ooni_org, "4.th.ooni.org" = local.dns_root_zone_ooni_org }