From bfa3069d7346bb36f0b6bc49ddb5754ebfc40d7a Mon Sep 17 00:00:00 2001 From: carlssonk Date: Fri, 27 Sep 2024 00:32:39 +0200 Subject: [PATCH] Fix string interpolation --- common/services/main.tf | 7 ++++--- common/services/outputs.tf | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/services/main.tf b/common/services/main.tf index 84f78bc..150aa72 100644 --- a/common/services/main.tf +++ b/common/services/main.tf @@ -65,7 +65,8 @@ data "cloudinit_config" "this" { server_name blackjack.carlssonk.com flagracer.carlssonk.com; location / { - proxy_pass http://$upstream; + set $backend "http://$upstream"; + proxy_pass $backend; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -81,7 +82,7 @@ data "cloudinit_config" "this" { } } -module "ec2_instance_nginx" { +module "ec2_instance_nginx_proxy" { count = var.reverse_proxy_type == "nginx" ? 1 : 0 name = "nginx-reverse-proxy" source = "../../modules/ec2-instance/default" @@ -118,7 +119,7 @@ module "ec2_instance_nginx" { module "ec2_instance_nginx_eip" { count = var.reverse_proxy_type == "nginx" ? 1 : 0 source = "../../modules/elastic-ip/default" - instance_id = module.ec2_instance_nginx[0].id + instance_id = module.ec2_instance_nginx_proxy[0].id } module "main_alb_access_logs_bucket" { diff --git a/common/services/outputs.tf b/common/services/outputs.tf index 48e2bf8..3bac172 100644 --- a/common/services/outputs.tf +++ b/common/services/outputs.tf @@ -1,7 +1,7 @@ output "policy_documents" { value = [ try(module.service_discovery_namespace[0].policy_document, null), - try(module.ec2_instance_nginx[0].policy_document, null), + try(module.ec2_instance_nginx_proxy[0].policy_document, null), try(module.ec2_instance_nginx_eip[0].policy_document, null), try(module.main_alb[0].policy_document, null), try(module.main_alb_access_logs_bucket[0].policy_document, null),