Skip to content

Commit 21e89d2

Browse files
committed
Simplify options
1 parent 8c69b60 commit 21e89d2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

operations/deployment/terraform/aws/bitovi_main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ module "aws_lb" {
156156
aws_r53_domain_name = var.aws_r53_domain_name
157157
# Certs
158158
aws_certificate_enabled = var.aws_r53_enable_cert ? var.aws_r53_cert_arn != "" ? true : try(module.aws_certificates[0].selected_arn, "") != "" ? true : false : false
159-
aws_certificates_selected_arn = var.aws_r53_enable_cert ? try(module.aws_certificates[0].selected_arn, var.aws_r53_cert_arn) : ""
159+
aws_certificates_selected_arn = try(module.aws_certificates[0].selected_arn, var.aws_r53_cert_arn, "")
160160
# Others
161161
aws_resource_identifier = var.aws_resource_identifier
162162
aws_resource_identifier_supershort = var.aws_resource_identifier_supershort

operations/deployment/terraform/modules/aws/lb/aws_lb.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ resource "aws_alb_listener" "lb_listener" {
150150
}
151151

152152
resource "aws_alb_listener" "http_redirect" {
153-
count = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) ? var.aws_certificate_enabled ? 1 : 0 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
153+
count = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) ? var.aws_certificates_selected_arn != "" ? 1 : 0 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
154154
load_balancer_arn = aws_lb.vm_alb.arn
155155
port = "80"
156156
protocol = "HTTP"

0 commit comments

Comments
 (0)