fix(config): seed app.ini when missing OR empty (-s), bump v3
A release that mounted app.ini directly as a read-only swarm config leaves a 0-byte placeholder at /etc/gitea/app.ini in the reattached config volume on upgrade; the original seed guard (! -f) treated that as present and skipped, so Gitea booted the install wizard on an empty config (/api/v1/version 404). Guard on ! -s (missing OR empty) so the rendered config is seeded; bump DOCKER_SETUP_SH_VERSION so the corrected entrypoint deploys (immutable swarm configs).
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
export APP_INI_VERSION=v22
|
export APP_INI_VERSION=v22
|
||||||
export DOCKER_SETUP_SH_VERSION=v2
|
export DOCKER_SETUP_SH_VERSION=v3
|
||||||
export PG_BACKUP_VERSION=v1
|
export PG_BACKUP_VERSION=v1
|
||||||
|
|
||||||
abra_backup_app() {
|
abra_backup_app() {
|
||||||
|
|||||||
@@ -18,9 +18,12 @@ if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi
|
|||||||
# (mounted at /etc/gitea/app.ini.init). Gitea must be able to PERSIST settings to app.ini — e.g.
|
# (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
|
# 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:
|
# mounted directly as a read-only swarm config this fails fatally ("open /etc/gitea/app.ini:
|
||||||
# read-only file system") on (re)deploy. Seed-once preserves any runtime-persisted state across
|
# read-only file system") on (re)deploy. Seed when MISSING OR EMPTY (`! -s`, not `! -f`): upgrading
|
||||||
# restarts/upgrades; delete /etc/gitea/app.ini to re-seed from the recipe's rendered config.
|
# from a release that mounted app.ini directly as a swarm config leaves a 0-byte placeholder at
|
||||||
if [ ! -f /etc/gitea/app.ini ]; then
|
# /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
|
cp /etc/gitea/app.ini.init /etc/gitea/app.ini
|
||||||
fi
|
fi
|
||||||
chmod 0600 /etc/gitea/app.ini 2>/dev/null || true
|
chmod 0600 /etc/gitea/app.ini 2>/dev/null || true
|
||||||
|
|||||||
Reference in New Issue
Block a user