Skip to content

Update fastpath2 #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aagbsn merged 2 commits into from
Jun 19, 2026
Merged

Update fastpath2 #445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c9fcc0
Update fastpath2 to use fastpath module
LDiazN Jun 18, 2026
0fdf027
remove unnecessary fastpath domain
LDiazN Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 7 additions & 63 deletions tf/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,83 +954,27 @@ module "ooni_fastpath" {
}

module "ooni_fastpath2" {
source = "../../modules/ec2"
source = "../../modules/ooni_fastpath"

stage = local.environment
name = "fastpath2"
env = local.environment

vpc_id = module.network.vpc_id
subnet_id = module.network.vpc_subnet_public[0].id
private_subnet_cidr = module.network.vpc_subnet_private[*].cidr_block
public_subnet_cidr = module.network.vpc_subnet_public[*].cidr_block
dns_zone_ooni_io = local.dns_zone_ooni_io

key_name = module.adm_iam_roles.oonidevops_key_name
instance_type = "c6i.large"

name = "oonifastpath2"
ingress_rules = [{
from_port = 22,
to_port = 22,
protocol = "tcp",
cidr_blocks = ["0.0.0.0/0"],
}, {
from_port = 8472,
to_port = 8472,
protocol = "tcp",
cidr_blocks = concat(module.network.vpc_subnet_private[*].cidr_block, module.network.vpc_subnet_public[*].cidr_block),
}, {
from_port = 8479,
to_port = 8479,
protocol = "tcp",
cidr_blocks = concat(module.network.vpc_subnet_private[*].cidr_block, module.network.vpc_subnet_public[*].cidr_block),
}, {
from_port = 8475, # for serving jsonl files
to_port = 8475,
protocol = "tcp",
cidr_blocks = concat(module.network.vpc_subnet_private[*].cidr_block, module.network.vpc_subnet_public[*].cidr_block),
}, {
from_port = 9100,
to_port = 9100,
protocol = "tcp"
cidr_blocks = ["${module.ooni_monitoring_proxy.aws_instance_private_ip}/32"]
}, {
from_port = 9102, # For fastpath metrics
to_port = 9102,
protocol = "tcp"
cidr_blocks = ["${module.ooni_monitoring_proxy.aws_instance_private_ip}/32", "${module.ooni_monitoring_proxy.aws_instance_public_ip}/32"]
}]

egress_rules = [{
from_port = 0,
to_port = 0,
protocol = "-1",
cidr_blocks = ["0.0.0.0/0"],
}, {
from_port = 0,
to_port = 0,
protocol = "-1",
ipv6_cidr_blocks = ["::/0"],
}]

sg_prefix = "oonifstp2"
tg_prefix = "fp2"

disk_size = 150

tags = merge(
local.tags,
{ Name = "ooni-tier0-fastpath2" }
)
}

resource "aws_route53_record" "fastpath2_alias" {
zone_id = local.dns_zone_ooni_io
name = "fastpath2.${local.environment}.ooni.io"
type = "CNAME"
ttl = 300
monitoring_proxy_private_ip = module.ooni_monitoring_proxy.aws_instance_private_ip
monitoring_proxy_public_ip = module.ooni_monitoring_proxy.aws_instance_public_ip

records = [
module.ooni_fastpath2.aws_instance_public_dns
]
tags = local.tags
}

module "fastpath_builder" {
Expand Down
Loading