chore: upgrade db to 10.11.19 (mariadb overlay)

.env.sample

@@ -12,10 +12,8 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 # COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
 # SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
-# Enable Git LFS on plain gitea (not needed with forgejo, which bundles it).
+# Anubis
-# Mounts the lfs_jwt_secret secret and sets GITEA_LFS_START_SERVER=true.
+# COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
-# COMPOSE_FILE="$COMPOSE_FILE:compose.lfs.yml"
-# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
 GITEA_DOMAIN=git.example.com
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true

abra.sh

@@ -1,5 +1,5 @@
-export APP_INI_VERSION=v22
+export APP_INI_VERSION=v21
-export DOCKER_SETUP_SH_VERSION=v3
+export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 
 abra_backup_app() {

app.ini.tmpl

@@ -61,7 +61,7 @@ SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
 SSH_PORT = {{ env "GITEA_SSH_PORT" }}
 START_SSH_SERVER = true
 LFS_START_SERVER = {{ env "GITEA_LFS_START_SERVER" }}
-{{ if or (eq (env "FORGE") "forgejo") (eq (env "GITEA_LFS_START_SERVER") "true") }}
+{{ if eq (env "FORGE") "forgejo" }}
 LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
 {{ end }}
 

compose.anubis.yml

@@ -0,0 +1,7 @@
+---
+version: "3.8"
+services:
+  app:
+    deploy:
+      labels:
+      - "traefik.http.routers.${STACK_NAME}.middlewares=anubis,${STACK_NAME}_cors"

compose.lfs.yml

@@ -1,13 +0,0 @@
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - GITEA_LFS_START_SERVER=true
-    secrets:
-      - lfs_jwt_secret
-
-secrets:
-  lfs_jwt_secret:
-    name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
-    external: true

compose.mariadb.yml

@@ -10,7 +10,7 @@ services:
     secrets:
       - db_password
   db:
-    image: "mariadb:10.11.2"
+    image: "mariadb:10.11.19"
     deploy:
       labels:
           backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'

compose.postgres.yml

@@ -10,7 +10,7 @@ services:
     secrets:
       - db_password
   db:
-    image: postgres:15.18
+    image: postgres:15.13
     deploy:
       labels:
         backupbot.backup.pre-hook: "/pg_backup.sh backup"

compose.yml

@@ -3,10 +3,10 @@ version: "3.8"
 
 services:
   app:
-    image: "gitea/gitea:1.26.2-rootless"
+    image: "gitea/gitea:1.24.2-rootless"
     configs:
       - source: app_ini
-        target: /etc/gitea/app.ini.init
+        target: /etc/gitea/app.ini
       - source: docker_setup_sh
         target: /usr/local/bin/docker-setup.sh
         mode: 0555
@@ -88,7 +88,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=3.6.0+1.24.2-rootless
+        - coop-cloud.${STACK_NAME}.version=3.5.3+1.24.2-rootless
 
 
 networks:

docker-setup.sh.tmpl

@@ -13,13 +13,3 @@ 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 app.ini.init). Gitea persists settings back to app.ini — e.g. it saves the
-# [oauth2] JWT_SECRET on boot since 1.24 — which crashes if app.ini is the read-only mount itself.
-# Test `! -s` (empty), not `! -f` (missing): upgrades from the old direct-mount layout leave a
-# 0-byte app.ini placeholder that still needs seeding. A non-empty app.ini is left untouched.
-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