Skip to content

Commit e2bfce3

Browse files
Deploy bors-prod account
This adds the DNS name configuration and configures deployment via GHA to the production account.
1 parent 258e03e commit e2bfce3

File tree

4 files changed

+66
-3
lines changed

4 files changed

+66
-3
lines changed

terragrunt/accounts/bors-prod/app/.terraform.lock.hcl

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
terraform {
2+
source = "../../../modules//bors"
3+
}
4+
5+
include {
6+
path = find_in_parent_folders()
7+
merge_strategy = "deep"
8+
}
9+
10+
inputs = {
11+
domain = "bors-prod.rust-lang.net"
12+
}

terragrunt/accounts/bors-staging/app/terragrunt.hcl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ include {
66
path = find_in_parent_folders()
77
merge_strategy = "deep"
88
}
9+
10+
inputs = {
11+
domain = "bors-staging.rust-lang.net"
12+
}

terragrunt/modules/bors/main.tf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ resource "aws_lb_listener" "primary" {
377377
}
378378

379379
resource "aws_acm_certificate" "primary" {
380-
domain_name = "bors-staging.rust-lang.net"
380+
domain_name = var.domain
381381
validation_method = "DNS"
382382

383383
lifecycle {
@@ -386,7 +386,7 @@ resource "aws_acm_certificate" "primary" {
386386
}
387387

388388
data "aws_route53_zone" "net" {
389-
name = "bors-staging.rust-lang.net"
389+
name = var.domain
390390
private_zone = false
391391
}
392392

@@ -414,7 +414,7 @@ resource "aws_acm_certificate_validation" "primary" {
414414

415415
resource "aws_route53_record" "lb" {
416416
zone_id = data.aws_route53_zone.net.zone_id
417-
name = "bors-staging.rust-lang.net"
417+
name = var.domain
418418
type = "A"
419419

420420
alias {
@@ -490,3 +490,7 @@ resource "aws_vpc_security_group_egress_rule" "rds_egress_anywhere_v6" {
490490
ip_protocol = -1
491491
to_port = -1
492492
}
493+
494+
variable "domain" {
495+
description = "domain to use"
496+
}

0 commit comments

Comments
 (0)