diff --git a/ops/glesys/dns-tvl-fyi.tf b/ops/glesys/dns-tvl-fyi.tf index 5aa374b64..233cb758e 100644 --- a/ops/glesys/dns-tvl-fyi.tf +++ b/ops/glesys/dns-tvl-fyi.tf @@ -81,23 +81,12 @@ resource "glesys_dnsdomain_record" "tvl_fyi_bugry_AAAA" { data = var.bugry_ipv6 } -# Explicit records for all services running on whitby -resource "glesys_dnsdomain_record" "tvl_fyi_whitby_services" { - domain = glesys_dnsdomain.tvl_fyi.id - type = "CNAME" - data = "whitby.tvl.fyi." - host = each.key - ttl = 60 # TODO - for_each = toset(local.whitby_services) -} - # Explicit records for all services running on nevsky resource "glesys_dnsdomain_record" "tvl_fyi_nevsky_services" { domain = glesys_dnsdomain.tvl_fyi.id type = "CNAME" data = "nevsky.tvl.fyi." host = each.key - ttl = 600 # TODO for_each = toset(local.nevsky_services) } @@ -107,7 +96,6 @@ resource "glesys_dnsdomain_record" "tvl_fyi_bugry_services" { type = "CNAME" data = "bugry.tvl.fyi." host = each.key - ttl = 600 # TODO for_each = toset(local.bugry_services) } diff --git a/ops/glesys/dns-tvl-su.tf b/ops/glesys/dns-tvl-su.tf index c4a4628a3..0e655c904 100644 --- a/ops/glesys/dns-tvl-su.tf +++ b/ops/glesys/dns-tvl-su.tf @@ -67,21 +67,11 @@ resource "glesys_dnsdomain_record" "tvl_su_sanduny_AAAA" { data = var.sanduny_ipv6 } -resource "glesys_dnsdomain_record" "cache_tvl_su_whitby_CNAME" { +resource "glesys_dnsdomain_record" "cache_tvl_su_nevsky_CNAME" { domain = glesys_dnsdomain.tvl_su.id host = "cache" type = "CNAME" - data = "whitby.tvl.su." -} - -# Explicit records for all services running on whitby -resource "glesys_dnsdomain_record" "tvl_su_whitby_services" { - domain = glesys_dnsdomain.tvl_su.id - type = "CNAME" - data = "whitby.tvl.su." - ttl = 60 - host = each.key - for_each = toset(local.whitby_services) + data = "nevsky.tvl.fyi." } # Explicit records for all services running on nevsky @@ -90,7 +80,6 @@ resource "glesys_dnsdomain_record" "tvl_su_nevsky_services" { type = "CNAME" data = "nevsky.tvl.fyi." host = each.key - ttl = 600 for_each = toset(local.nevsky_services) } @@ -100,7 +89,6 @@ resource "glesys_dnsdomain_record" "tvl_su_bugry_services" { type = "CNAME" data = "bugry.tvl.fyi." host = each.key - ttl = 600 for_each = toset(local.bugry_services) } @@ -109,7 +97,7 @@ resource "glesys_dnsdomain_record" "tvix_su_tvixbolt_CNAME" { domain = glesys_dnsdomain.tvl_su.id host = "tvixbolt" type = "CNAME" - data = "whitby.tvl.su." + data = "nevsky.tvl.fyi." } resource "glesys_dnsdomain_record" "tvl_su_inbox_CNAME" { diff --git a/ops/glesys/main.tf b/ops/glesys/main.tf index cefd5d697..ebb58cb37 100644 --- a/ops/glesys/main.tf +++ b/ops/glesys/main.tf @@ -92,11 +92,6 @@ variable "sanduny_ipv6" { } locals { - # Hostnames of all public services on whitby - whitby_services = [ - "deploys", - ] - # Hostnames of all public services on nevsky nevsky_services = [ "auth", @@ -104,6 +99,7 @@ locals { "cl", "code", "cs", + "deploys", # TODO: unsupported (b/437) "grep", "status", ]