diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf index dc1f879..02a9e10 100644 --- a/tf/environments/dev/main.tf +++ b/tf/environments/dev/main.tf @@ -562,7 +562,8 @@ module "ooniapi_frontend" { "8.th.dev.ooni.io" : local.dns_zone_ooni_io } - oonith_domains = ["8.th.dev.ooni.io"] + oonith_domains = ["8.th.dev.ooni.io"] + direct_domain_suffix = "dev.ooni.io" stage = local.environment dns_zone_ooni_io = local.dns_zone_ooni_io diff --git a/tf/modules/ooniapi_frontend/main.tf b/tf/modules/ooniapi_frontend/main.tf index 33d8b4b..eef04ac 100644 --- a/tf/modules/ooniapi_frontend/main.tf +++ b/tf/modules/ooniapi_frontend/main.tf @@ -75,7 +75,15 @@ resource "aws_lb_listener_rule" "ooniapi_oonirun_rule" { path_pattern { values = ["/api/v2/oonirun/*"] } + } + + condition { + host_header { + values = ["oonirun.${var.direct_domain_suffix}"] + } + } + } resource "aws_lb_listener_rule" "ooniapi_ooniauth_rule" { @@ -98,6 +106,13 @@ resource "aws_lb_listener_rule" "ooniapi_ooniauth_rule" { ] } } + + condition { + host_header { + values = ["ooniauth.${var.direct_domain_suffix}"] + } + } + } resource "aws_lb_listener_rule" "ooniapi_ooniprobe_rule" { @@ -116,6 +131,13 @@ resource "aws_lb_listener_rule" "ooniapi_ooniprobe_rule" { ] } } + + condition { + host_header { + values = ["ooniprobe.${var.direct_domain_suffix}"] + } + } + } resource "aws_lb_listener_rule" "ooniapi_oonifindings_rule" { @@ -132,6 +154,13 @@ resource "aws_lb_listener_rule" "ooniapi_oonifindings_rule" { values = ["/api/v1/incidents/*"] } } + + condition { + host_header { + values = ["oonifindings.${var.direct_domain_suffix}"] + } + } + } ## DNS diff --git a/tf/modules/ooniapi_frontend/variables.tf b/tf/modules/ooniapi_frontend/variables.tf index ba02c08..9d5cf06 100644 --- a/tf/modules/ooniapi_frontend/variables.tf +++ b/tf/modules/ooniapi_frontend/variables.tf @@ -55,3 +55,8 @@ variable "oonith_domains" { type = list(string) default = ["*.th.dev.ooni.io"] } + +variable "direct_domain_suffix" { + type = string + default = "dev.ooni.io" +}