No re-run

carlssonk · Sep 26, 2024 · f1d5e09 · f1d5e09
1 parent f8e38a0
commit f1d5e09
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 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" {
+module "ec2_instance_nginx_proxy" {
   count             = var.reverse_proxy_type == "nginx" ? 1 : 0
   name              = "nginx-reverse-proxy"
   source            = "../../modules/ec2-instance/default"
@@ -43,16 +43,24 @@ module "ec2_instance_nginx" {
   subnet_ids        = var.networking_outputs.main_vpc_public_subnet_ids
   security_group_id = var.security_outputs.security_group_alb_id # Should have the same security group rules as alb
 
-  user_data = templatefile("${path.module}/run_every_boot.tpl", {
-    nginx_config = templatefile("${path.module}/nginx_reverse_proxy.tpl", {
-      services_map = {
-        "flagracer.carlssonk.com" = "carlssonk/flagracer", # TODO
-        "blackjack.carlssonk.com" = "carlssonk/blackjack", # TODO
-      }
-      root_domains    = var.root_domains
-      certbot_domains = local.certbot_domains
-    })
+  user_data = templatefile("${path.module}/nginx_reverse_proxy.tpl", {
+    services_map = {
+      "flagracer.carlssonk.com" = "carlssonk/flagracer", # TODO
+      "blackjack.carlssonk.com" = "carlssonk/blackjack", # TODO
+    }
+    root_domains    = var.root_domains
+    certbot_domains = local.certbot_domains
   })
+  # user_data = templatefile("${path.module}/run_every_boot.tpl", {
+  #   nginx_config = templatefile("${path.module}/nginx_reverse_proxy.tpl", {
+  #     services_map = {
+  #       "flagracer.carlssonk.com" = "carlssonk/flagracer", # TODO
+  #       "blackjack.carlssonk.com" = "carlssonk/blackjack", # TODO
+  #     }
+  #     root_domains    = var.root_domains
+  #     certbot_domains = local.certbot_domains
+  #   })
+  # })
 
   tags = {
     Name = "Nginx Reverse Proxy"
@@ -62,7 +70,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/nginx_reverse_proxy.tpl b/common/services/nginx_reverse_proxy.tpl
@@ -5,7 +5,7 @@ yum update -y
 yum install -y nginx certbot python3-certbot-nginx
 
 # Create nginx config
-sudo tee /etc/nginx/nginx.conf <<EOF
+tee /etc/nginx/nginx.conf <<EOF
 events {
     worker_connections 1024;
 }
@@ -63,4 +63,5 @@ if systemctl is-active --quiet nginx; then
     systemctl reload nginx
 else
     systemctl start nginx
+    systemctl enable nginx
 fi
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[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),