From 50fafc789a36fa456283d356f21464cde4d03f43 Mon Sep 17 00:00:00 2001
From: Ramon <dev@ramonbesselink.nl>
Date: Tue, 14 Jul 2026 13:23:15 +0200
Subject: [PATCH] v0.3.05-beta: rol nginx-config atomisch uit

---
 .forgejo/workflows/dev.yaml     | 9 ++++++---
 .forgejo/workflows/release.yaml | 9 ++++++---
 VERSION                         | 2 +-
 public/js/core.js               | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/dev.yaml b/.forgejo/workflows/dev.yaml
index 7da4b2c..1e4a268 100644
--- a/.forgejo/workflows/dev.yaml
+++ b/.forgejo/workflows/dev.yaml
@@ -57,9 +57,12 @@ jobs:
           echo "${{ secrets.TEST_SSH_KEY }}" > deploy_key
           chmod 600 deploy_key
           scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=15 \
-            -i deploy_key deploy/compose.deploy.yaml deploy/nginx.conf \
-            ${{ secrets.TEST_USER }}@${{ secrets.TEST_HOST }}:${{ secrets.TEST_DEPLOY_PATH }}/
+            -i deploy_key deploy/compose.deploy.yaml \
+            ${{ secrets.TEST_USER }}@${{ secrets.TEST_HOST }}:${{ secrets.TEST_DEPLOY_PATH }}/compose.deploy.yaml
+          scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=15 \
+            -i deploy_key deploy/nginx.conf \
+            ${{ secrets.TEST_USER }}@${{ secrets.TEST_HOST }}:${{ secrets.TEST_DEPLOY_PATH }}/nginx.conf.new
           ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=15 \
             -i deploy_key ${{ secrets.TEST_USER }}@${{ secrets.TEST_HOST }} \
-            "set -e && cd ${{ secrets.TEST_DEPLOY_PATH }} && echo '${{ secrets.REGISTRY_TOKEN }}' | docker login ${{ vars.REGISTRY }} -u '${{ secrets.REGISTRY_USER }}' --password-stdin && sed -i 's|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.dev_tag }}|' .env && docker compose -f compose.deploy.yaml pull app && docker compose -f compose.deploy.yaml up -d --force-recreate app web && docker image prune -f"
+            "set -e && cd ${{ secrets.TEST_DEPLOY_PATH }} && mv -f nginx.conf.new nginx.conf && echo '${{ secrets.REGISTRY_TOKEN }}' | docker login ${{ vars.REGISTRY }} -u '${{ secrets.REGISTRY_USER }}' --password-stdin && sed -i 's|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.dev_tag }}|' .env && docker compose -f compose.deploy.yaml pull app && docker compose -f compose.deploy.yaml up -d --force-recreate app web && docker image prune -f"
           rm -f deploy_key
diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml
index 2941afe..2d0956f 100644
--- a/.forgejo/workflows/release.yaml
+++ b/.forgejo/workflows/release.yaml
@@ -55,9 +55,12 @@ jobs:
           echo "${{ secrets.PROD_SSH_KEY }}" > deploy_key
           chmod 600 deploy_key
           scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=15 \
-            -i deploy_key deploy/compose.deploy.yaml deploy/nginx.conf \
-            ${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}:${{ secrets.PROD_DEPLOY_PATH }}/
+            -i deploy_key deploy/compose.deploy.yaml \
+            ${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}:${{ secrets.PROD_DEPLOY_PATH }}/compose.deploy.yaml
+          scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=15 \
+            -i deploy_key deploy/nginx.conf \
+            ${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}:${{ secrets.PROD_DEPLOY_PATH }}/nginx.conf.new
           ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o ConnectTimeout=15 \
             -i deploy_key ${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }} \
-            "set -e && cd ${{ secrets.PROD_DEPLOY_PATH }} && echo '${{ secrets.REGISTRY_TOKEN }}' | docker login ${{ vars.REGISTRY }} -u '${{ secrets.REGISTRY_USER }}' --password-stdin && sed -i 's|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.version_tag }}|' .env && docker compose -f compose.deploy.yaml pull app && docker compose -f compose.deploy.yaml up -d --force-recreate app web && docker image prune -f"
+            "set -e && cd ${{ secrets.PROD_DEPLOY_PATH }} && mv -f nginx.conf.new nginx.conf && echo '${{ secrets.REGISTRY_TOKEN }}' | docker login ${{ vars.REGISTRY }} -u '${{ secrets.REGISTRY_USER }}' --password-stdin && sed -i 's|^IMAGE=.*|IMAGE=${{ steps.meta.outputs.version_tag }}|' .env && docker compose -f compose.deploy.yaml pull app && docker compose -f compose.deploy.yaml up -d --force-recreate app web && docker image prune -f"
           rm -f deploy_key
diff --git a/VERSION b/VERSION
index 15700f5..dbc6fab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.04-beta
+0.3.05-beta
diff --git a/public/js/core.js b/public/js/core.js
index 12ebf4f..d7e89a0 100644
--- a/public/js/core.js
+++ b/public/js/core.js
@@ -2,7 +2,7 @@
 "use strict";
 /* version — shown until /api/version resolves (or if the fetch fails, e.g. offline).
    Kept in sync by hand with the VERSION file at the repo root on every release. */
-const VERSION = "0.3.04-beta";
+const VERSION = "0.3.05-beta";
 (function(){
   const tag = document.getElementById("verTag");
   tag.textContent = "v"+VERSION;