From 77624221b415b160556ba72dab16fd9486774de7 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 18 Feb 2025 15:10:02 -0300
Subject: [PATCH 1/2] feat: lfs server

---
 .env.sample         | 2 ++
 abra.sh             | 2 +-
 app.ini.tmpl        | 4 ++++
 compose.forgejo.yml | 8 ++++++++
 compose.yml         | 1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.env.sample b/.env.sample
index 8763e7c..24e956e 100644
--- a/.env.sample
+++ b/.env.sample
@@ -10,6 +10,7 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 
 # Enable to use forgejo instead of gitea
 # COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
+# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
 GITEA_DOMAIN=git.example.com
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
@@ -33,6 +34,7 @@ GITEA_DEFAULT_ORG_VISIBILITY=limited
 GITEA_REQUIRE_SIGNIN_VIEW=true
 GITEA_ENABLE_PUSH_CREATE_USER=false
 GITEA_ENABLE_PUSH_CREATE_ORG=false
+GITEA_LFS_START_SERVER=false
 
 GITEA_REPO_UPLOAD_ENABLED=true
 GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
diff --git a/abra.sh b/abra.sh
index 72c6ada..ecb8721 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v20
+export APP_INI_VERSION=v21
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 
diff --git a/app.ini.tmpl b/app.ini.tmpl
index ab137b6..900d289 100644
--- a/app.ini.tmpl
+++ b/app.ini.tmpl
@@ -60,6 +60,10 @@ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
 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 eq (env "FORGEJO") "1" }}
+LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
+{{ end }}
 
 [security]
 INSTALL_LOCK = true
diff --git a/compose.forgejo.yml b/compose.forgejo.yml
index b58d608..5f1cd5e 100644
--- a/compose.forgejo.yml
+++ b/compose.forgejo.yml
@@ -3,3 +3,11 @@ version: '3.8'
 services:
   app:
     image: codeberg.org/forgejo/forgejo:10.0.0-rootless
+    environment:
+    - FORGEJO=1
+    secrets:
+    - lfs_jwt_secret
+secrets:
+  lfs_jwt_secret:
+    name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
+    external: true
diff --git a/compose.yml b/compose.yml
index 123d0c7..3c474ae 100644
--- a/compose.yml
+++ b/compose.yml
@@ -52,6 +52,7 @@ services:
       - GITEA_DEFAULT_ORG_VISIBILITY
       - GITEA_REQUIRE_SIGNIN_VIEW
       - GITEA__oauth2__REFRESH_TOKEN_EXPIRATION_TIME
+      - GITEA_LFS_START_SERVER=${GITEA_LFS_START_SERVER:-false}
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea

From b44e18f063b563e9afca434b88f3839acfad8539 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 20 Feb 2025 09:17:58 -0300
Subject: [PATCH 2/2] feat: configuration by forge

---
 app.ini.tmpl        | 2 +-
 compose.forgejo.yml | 2 +-
 compose.yml         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app.ini.tmpl b/app.ini.tmpl
index 900d289..9d5ceb2 100644
--- a/app.ini.tmpl
+++ b/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 eq (env "FORGEJO") "1" }}
+{{ if eq (env "FORGE") "forgejo" }}
 LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
 {{ end }}
 
diff --git a/compose.forgejo.yml b/compose.forgejo.yml
index 5f1cd5e..48078ac 100644
--- a/compose.forgejo.yml
+++ b/compose.forgejo.yml
@@ -4,7 +4,7 @@ services:
   app:
     image: codeberg.org/forgejo/forgejo:10.0.0-rootless
     environment:
-    - FORGEJO=1
+    - FORGE=forgejo
     secrets:
     - lfs_jwt_secret
 secrets:
diff --git a/compose.yml b/compose.yml
index 3c474ae..9a67888 100644
--- a/compose.yml
+++ b/compose.yml
@@ -15,6 +15,7 @@ services:
       - jwt_secret
       - secret_key
     environment:
+      - FORGE=gitea
       - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
       - GITEA_APP_NAME
       - GITEA_AUTO_WATCH_NEW_REPOS