Skip to content

Commit 9f80fd4

Browse files
authored
Setup linkry HTTPS certificate for acm.gg (#376)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Frontend now supports multiple public domains. * Added configurable certificate ARN parameter for deployments. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent bf24941 commit 9f80fd4

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

terraform/envs/prod/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ module "frontend" {
124124
CoreCertificateArn = var.CoreCertificateArn
125125
CorePublicDomain = var.CorePublicDomain
126126
IcalPublicDomain = var.IcalPublicDomain
127-
LinkryPublicDomain = var.LinkryPublicDomain
127+
LinkryPublicDomains = [var.LinkryPublicDomain, "acm.gg"]
128+
LinkryCertificateArn = var.LinkryCertificateArn
128129
LinkryEdgeFunctionArn = module.lambdas.linkry_redirect_function_arn
129130
}
130131

terraform/envs/prod/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ variable "CoreCertificateArn" {
2424
default = "arn:aws:acm:us-east-1:298118738376:certificate/aeb93d9e-b0b7-4272-9c12-24ca5058c77e"
2525
}
2626

27+
// For acm.gg we need a seperate cert for Linkry
28+
variable "LinkryCertificateArn" {
29+
type = string
30+
default = "arn:aws:acm:us-east-1:298118738376:certificate/aa58a5e8-49eb-44fb-b118-ab0a7ecd2054"
31+
}
32+
2733
variable "EmailDomain" {
2834
type = string
2935
default = "acm.illinois.edu"

terraform/envs/qa/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ module "frontend" {
127127
CoreCertificateArn = var.CoreCertificateArn
128128
CorePublicDomain = var.CorePublicDomain
129129
IcalPublicDomain = var.IcalPublicDomain
130-
LinkryPublicDomain = var.LinkryPublicDomain
130+
LinkryPublicDomains = [var.LinkryPublicDomain]
131131
LinkryEdgeFunctionArn = module.lambdas.linkry_redirect_function_arn
132+
LinkryCertificateArn = var.LinkryCertificateArn
132133
}
133134

134135
module "assets" {

terraform/envs/qa/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ variable "CoreCertificateArn" {
1313
default = "arn:aws:acm:us-east-1:427040638965:certificate/63ccdf0b-d2b5-44f0-b589-eceffb935c23"
1414
}
1515

16+
17+
variable "LinkryCertificateArn" {
18+
type = string
19+
default = "arn:aws:acm:us-east-1:427040638965:certificate/63ccdf0b-d2b5-44f0-b589-eceffb935c23"
20+
}
21+
1622
variable "CorePublicDomain" {
1723
type = string
1824
default = "core.aws.qa.acmuiuc.org"

terraform/modules/frontend/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ resource "aws_cloudfront_distribution" "linkry_cloudfront_distribution" {
458458
origin_ssl_protocols = ["TLSv1", "TLSv1.1", "TLSv1.2"]
459459
}
460460
}
461-
aliases = [var.LinkryPublicDomain]
461+
aliases = var.LinkryPublicDomains
462462
enabled = true
463463
is_ipv6_enabled = true
464464
default_cache_behavior {
@@ -475,7 +475,7 @@ resource "aws_cloudfront_distribution" "linkry_cloudfront_distribution" {
475475
}
476476
}
477477
viewer_certificate {
478-
acm_certificate_arn = var.CoreCertificateArn
478+
acm_certificate_arn = var.LinkryCertificateArn
479479
minimum_protocol_version = "TLSv1.2_2021"
480480
ssl_support_method = "sni-only"
481481
}

terraform/modules/frontend/variables.tf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ variable "IcalPublicDomain" {
2828
description = "Ical Public Host"
2929
}
3030

31-
variable "LinkryPublicDomain" {
32-
type = string
33-
description = "Ical Public Host"
31+
variable "LinkryPublicDomains" {
32+
type = set(string)
33+
description = "Linky Public Hosts"
3434
}
3535

3636

@@ -39,6 +39,10 @@ variable "CoreCertificateArn" {
3939
description = "Core ACM ARN"
4040
}
4141

42+
variable "LinkryCertificateArn" {
43+
type = string
44+
description = "Linkry ACM ARN"
45+
}
4246

4347
variable "BucketPrefix" {
4448
type = string

0 commit comments

Comments
 (0)