File tree Expand file tree Collapse file tree 6 files changed +25
-7
lines changed Expand file tree Collapse file tree 6 files changed +25
-7
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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+
2733variable "EmailDomain" {
2834 type = string
2935 default = " acm.illinois.edu"
Original file line number Diff line number Diff 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
134135module "assets" {
Original file line number Diff line number Diff 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+
1622variable "CorePublicDomain" {
1723 type = string
1824 default = " core.aws.qa.acmuiuc.org"
Original file line number Diff line number Diff 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 }
Original file line number Diff line number Diff 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
4347variable "BucketPrefix" {
4448 type = string
You can’t perform that action at this time.
0 commit comments