From e1633a041fd648fd809c75b1600f4290b0973a32 Mon Sep 17 00:00:00 2001
From: Jezza Hehn <jezza.hehn@wikitribune.com>
Date: Mon, 13 Apr 2026 22:16:58 +0000
Subject: [PATCH] Add domain variable to cloud-init and fix PROJECT_NAME
 references

---
 terraform/cloud-init.yaml.tpl | 17 ++++++++++-------
 terraform/main.tf             |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/terraform/cloud-init.yaml.tpl b/terraform/cloud-init.yaml.tpl
index 21b6705..a3b7ce0 100644
--- a/terraform/cloud-init.yaml.tpl
+++ b/terraform/cloud-init.yaml.tpl
@@ -18,14 +18,17 @@ apt-get install -y nodejs
 
 # Create directories
 mkdir -p /opt/contact-api
-mkdir -p /var/www/${PROJECT_NAME}
-mkdir -p /var/www/${PROJECT_NAME}/css
-mkdir -p /var/www/${PROJECT_NAME}/js
+mkdir -p /var/www/${project_name}
+mkdir -p /var/www/${project_name}/css
+mkdir -p /var/www/${project_name}/js
+
+# Set domain variable
+DOMAIN=${DOMAIN}
 
 # Set up nginx configuration
-cat << 'EOF' > /etc/nginx/sites-available/${PROJECT_NAME}
+cat << 'EOF' > /etc/nginx/sites-available/${project_name}
 server {
-    root /var/www/${PROJECT_NAME};
+    root /var/www/${project_name};
     index index.html;
     server_name ${DOMAIN} www.${DOMAIN};
 
@@ -62,7 +65,7 @@ server {
 EOF
 
 # Symlink nginx config
-ln -sf /etc/nginx/sites-available/${PROJECT_NAME} /etc/nginx/sites-enabled/${PROJECT_NAME}
+ln -sf /etc/nginx/sites-available/${project_name} /etc/nginx/sites-enabled/${project_name}
 
 # Remove default nginx site
 rm -f /etc/nginx/sites-enabled/default
@@ -130,7 +133,7 @@ npm install
 
 # Set permissions
 chown -R www-data:www-data /opt/contact-api
-chown -R www-data:www-data /var/www/${PROJECT_NAME}
+chown -R www-data:www-data /var/www/${project_name}
 
 # Start contact-api
 systemctl start contact-api.service
diff --git a/terraform/main.tf b/terraform/main.tf
index c0a2e5d..b96ea7d 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -99,6 +99,7 @@ resource "hcloud_server" "krustyplanet" {
   user_data = templatefile("${path.module}/cloud-init.yaml.tpl", {
     project_name        = var.project_name
     node_version        = var.node_version
+    domain              = var.domain
   })
 
   labels = {