From a0f2db8872a30a87443f4224956049d70c6139ad Mon Sep 17 00:00:00 2001
From: autonomic-bot <autonomic-bot@autonomic.zone>
Date: Thu, 18 Jun 2026 02:52:52 +0000
Subject: [PATCH] redfix gitea fix v2 (-s seed, v3)

---
 abra.sh              |  2 +-
 compose.yml          |  2 +-
 docker-setup.sh.tmpl | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/abra.sh b/abra.sh
index 54bf0f3..de5cbed 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,5 +1,5 @@
 export APP_INI_VERSION=v22
-export DOCKER_SETUP_SH_VERSION=v1
+export DOCKER_SETUP_SH_VERSION=v3
 export PG_BACKUP_VERSION=v1
 
 abra_backup_app() {
diff --git a/compose.yml b/compose.yml
index 88265c2..47fa295 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,7 +6,7 @@ services:
     image: "gitea/gitea:1.24.2-rootless"
     configs:
       - source: app_ini
-        target: /etc/gitea/app.ini
+        target: /etc/gitea/app.ini.init
       - source: docker_setup_sh
         target: /usr/local/bin/docker-setup.sh
         mode: 0555
diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl
index 310e8f7..a3a626c 100644
--- a/docker-setup.sh.tmpl
+++ b/docker-setup.sh.tmpl
@@ -13,3 +13,17 @@ mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM}
 # Prepare temp folder
 mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP}
 if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi
+
+# Seed app.ini into the WRITABLE config volume (/etc/gitea) from the read-only swarm config
+# (mounted at /etc/gitea/app.ini.init). Gitea must be able to PERSIST settings to app.ini — e.g.
+# Gitea 1.24+ (re)generates and SAVES the [oauth2] JWT_SECRET at LoadCommonSettings; with app.ini
+# mounted directly as a read-only swarm config this fails fatally ("open /etc/gitea/app.ini:
+# read-only file system") on (re)deploy. Seed when MISSING OR EMPTY (`! -s`, not `! -f`): upgrading
+# from a release that mounted app.ini directly as a swarm config leaves a 0-byte placeholder at
+# /etc/gitea/app.ini in the reattached config volume — `! -f` would treat that as "present" and skip,
+# leaving Gitea to boot the install wizard on an empty config. A non-empty app.ini (Gitea's persisted
+# state) is preserved across restarts; truncate/delete it to force a re-seed from the rendered config.
+if [ ! -s /etc/gitea/app.ini ]; then
+  cp /etc/gitea/app.ini.init /etc/gitea/app.ini
+fi
+chmod 0600 /etc/gitea/app.ini 2>/dev/null || true