refactor: changes to allow terraform to apply cleanly

ooni · Dec 18, 2024 · 6c541be · 6c541be
1 parent cfb1049
commit 6c541be
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf
@@ -414,7 +414,7 @@ module "ooniapi_reverseproxy" {
   )
 }
 
-module "ooni_backendproxy" {
+module "ooni_clickhouse_proxy" {
   source = "../../modules/ec2"
 
   stage = local.environment
@@ -427,7 +427,7 @@ module "ooni_backendproxy" {
   key_name      = module.adm_iam_roles.oonidevops_key_name
   instance_type = "t3a.nano"
 
-  name = "oonibkprx"
+  name = "oonickprx"
   ingress_rules = [{
     from_port = 22,
     to_port = 22,
@@ -457,15 +457,26 @@ module "ooni_backendproxy" {
     ipv6_cidr_blocks = ["::/0"]
   }]
 
-  sg_prefix = "oobkprx"
-  tg_prefix = "bkprx"
+  sg_prefix = "oockprx"
+  tg_prefix = "ckpr"
 
   tags = merge(
     local.tags,
-    { Name = "ooni-tier0-backendproxy" }
+    { Name = "ooni-tier0-clickhouseproxy" }
   )
 }
 
+resource "aws_route53_record" "clickhouse_proxy_alias" {
+  zone_id = local.dns_zone_ooni_io
+  name    = "clickhouseproxy.${local.environment}.ooni.io"
+  type    = "CNAME"
+  ttl     = 300
+
+  records = [
+    module.ooni_clickhouse_proxy.aws_instance_public_dns
+  ]
+}
+
 #### OONI Run service
 
 module "ooniapi_oonirun_deployer" {