Minor tweaks

Author: LeoDiazL

operations/deployment/terraform/aws/bitovi_main.tf

@@ -87,8 +87,8 @@ module "aws_route53" {
   aws_r53_root_domain_deploy = var.aws_r53_root_domain_deploy
   aws_r53_enable_cert        = var.aws_r53_enable_cert
   # ELB
-  aws_elb_dns_name = try(module.aws_lb[0].aws_alb_dns_name,module.aws_elb[0].aws_elb_dns_name,module.ec2[0].instance_public_ip,"")
-  aws_elb_zone_id  = try(module.aws_lb[0].aws_alb_zone_id,module.aws_elb[0].aws_elb_zone_id,"","")
+  aws_elb_dns_name = try(module.aws_lb[0].aws_alb_dns_name, module.aws_elb[0].aws_elb_dns_name, module.ec2[0].instance_public_ip, "")
+  aws_elb_zone_id  = try(module.aws_lb[0].aws_alb_zone_id, module.aws_elb[0].aws_elb_zone_id, "", "")
   # Certs
   aws_certificates_selected_arn = var.aws_r53_enable_cert && var.aws_r53_domain_name != "" ? module.aws_certificates[0].selected_arn : ""
   # Others

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

@@ -129,7 +129,7 @@ resource "aws_alb_listener" "lb_listener" {
 }
 
 resource "aws_alb_listener" "http_redirect" {
-  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) && local.alb_ssl_available ? 1 : 0
+  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) && var.aws_certificates_selected_arn != ""  ? 1 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "80"
   protocol          = "HTTP"
@@ -150,7 +150,7 @@ resource "aws_alb_listener" "http_redirect" {
 }
 
 resource "aws_alb_listener" "http_forward" {
-  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) && !local.alb_ssl_available && !var.aws_alb_www_to_apex_redirect ? 1 : 0
+  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) && var.aws_certificates_selected_arn == ""  && !var.aws_alb_www_to_apex_redirect ? 1 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "80"
   protocol          = "HTTP"
@@ -166,7 +166,7 @@ resource "aws_alb_listener" "http_forward" {
 }
 
 resource "aws_alb_listener" "http_www_redirect" {
-  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) && !local.alb_ssl_available && var.aws_alb_www_to_apex_redirect ? 1 : 0
+  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 80) && var.aws_certificates_selected_arn == "" && var.aws_alb_www_to_apex_redirect ? 1 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "80"
   protocol          = "HTTP"
@@ -250,7 +250,7 @@ resource "aws_security_group_rule" "incoming_alb_https" {
 ###
 
 resource "aws_alb_listener" "https_redirect" {
-  count = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 443) && local.alb_ssl_available ? 1 : 0
+  count             = var.aws_alb_redirect_enable && !contains(local.alb_listen_port, 443) && local.alb_ssl_available ? 1 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "443"
   protocol          = "HTTPS"