From 5e3c75d5647ed6b46712b9482d7aee488d68d1c7 Mon Sep 17 00:00:00 2001
From: cclohmar <claus.lohmar@lohmar.co.uk>
Date: Fri, 10 Jul 2026 16:47:06 +0100
Subject: [PATCH] fix: kill old Caddy processes, fix .env permissions

---
 deploy.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deploy.sh b/deploy.sh
index 50095a8..1b27212 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -39,6 +39,9 @@ if [ "$GREENFIELD" = true ]; then
     systemctl disable nextworkspace 2>/dev/null || true
     rm -f /etc/systemd/system/nextworkspace.service
     systemctl daemon-reload
+    # Kill any lingering Caddy processes on port 80/443
+    pkill -f "caddy run" 2>/dev/null || true
+    fuser -k 80/tcp 443/tcp 2>/dev/null || true
     # Force clean ALL old pods, containers, and networks
     for p in $(podman pod ls -q 2>/dev/null); do podman pod rm -f "$p" 2>/dev/null || true; done
     podman rm -f caddy authelia launcher 2>/dev/null || true
@@ -63,7 +66,7 @@ if [ "$GREENFIELD" = true ]; then
 
     if [ -f "$BACKUP_DIR/.env" ]; then
         cp "$BACKUP_DIR/.env" "$TARGET_DIR/.env"
-        chmod 600 "$TARGET_DIR/.env"
+        chmod 644 "$TARGET_DIR/.env"
     fi
 
     # Generate Caddyfile