Indentation fix

carlssonk · Sep 26, 2024 · ecceea1 · ecceea1
1 parent 215b8b3
commit ecceea1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/common/services/main.tf b/common/services/main.tf
@@ -34,7 +34,7 @@ module "service_discovery_namespace" {
   namespace_name = module.globals.var.organization
 }
 
-module "ec2_instance_nginx_proxy" {
+module "ec2_instance_nginx" {
   count             = var.reverse_proxy_type == "nginx" ? 1 : 0
   name              = "nginx-reverse-proxy"
   source            = "../../modules/ec2-instance/default"
@@ -62,7 +62,7 @@ module "ec2_instance_nginx_proxy" {
 module "ec2_instance_nginx_eip" {
   count       = var.reverse_proxy_type == "nginx" ? 1 : 0
   source      = "../../modules/elastic-ip/default"
-  instance_id = module.ec2_instance_nginx_proxy[0].id
+  instance_id = module.ec2_instance_nginx[0].id
 }
 
 module "main_alb_access_logs_bucket" {

diff --git a/common/services/nginx_reverse_proxy.tpl b/common/services/nginx_reverse_proxy.tpl
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yum update
+yum update -y
 if ! rpm -q nginx certbot python3-certbot-nginx > /dev/null; then
     yum install -y nginx certbot python3-certbot-nginx
 fi
@@ -13,7 +13,7 @@ events {
 
 http {
 
-    map $http_host $upstream {
+    map $\http_host $\upstream {
         hostnames;
         %{ for domain, backend in services_map ~}
         ${domain} ${backend};
@@ -24,7 +24,7 @@ http {
     server {
         listen 80;
         server_name _;
-        return 301 https://$host$request_uri;
+        return 301 https://$\host$\request_uri;
     }
 
     server {
@@ -42,11 +42,11 @@ http {
         ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
 
         location / {
-            proxy_pass http://$upstream;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_pass http://$\upstream;
+            proxy_set_header Host $\host;
+            proxy_set_header X-Real-IP $\remote_addr;
+            proxy_set_header X-Forwarded-For $\proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $\scheme;
         }
     }
 }

diff --git 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_proxy[0].policy_document, null),
+    try(module.ec2_instance_nginx[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),

diff --git a/common/services/run_every_boot.tpl b/common/services/run_every_boot.tpl
@@ -6,7 +6,7 @@ write_files:
   - path: /var/lib/cloud/scripts/per-boot/user-script.sh
     permissions: '0755'
     content: |
-        ${nginx_config}
+${indent(8, nginx_config)}
 
 runcmd:
   - /var/lib/cloud/scripts/per-boot/user-script.sh