From d9c4baaea9324d063f237697c75c22f6533c003d Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Fri, 13 Oct 2023 11:56:25 +0200
Subject: [PATCH] simplify forgejo configuration

---
 targets/forgejo/conf/app.ini       | 101 -----------------------------
 targets/forgejo/docker-compose.yml |   6 +-
 2 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 targets/forgejo/conf/app.ini

diff --git a/targets/forgejo/conf/app.ini b/targets/forgejo/conf/app.ini
deleted file mode 100644
index ed2391b..0000000
--- a/targets/forgejo/conf/app.ini
+++ /dev/null
@@ -1,101 +0,0 @@
-APP_NAME = Forgejo: Beyond coding. We forge.
-RUN_MODE = prod
-RUN_USER = git
-WORK_PATH = /data/gitea
-
-[repository]
-ROOT = /data/git/repositories
-
-[repository.local]
-LOCAL_COPY_PATH = /data/gitea/tmp/local-repo
-
-[repository.upload]
-TEMP_PATH = /data/gitea/uploads
-
-[server]
-APP_DATA_PATH = /data/gitea
-DOMAIN = forgejo
-SSH_DOMAIN = localhost
-HTTP_PORT = 80
-ROOT_URL = http://forgejo:80/
-DISABLE_SSH = false
-SSH_PORT = 22
-SSH_LISTEN_PORT = 22
-LFS_START_SERVER = true
-LFS_JWT_SECRET = hqcWxK62ZAgYFGNPOj8JA2657ZBlaseX5EYjeibS5T8
-OFFLINE_MODE = false
-
-[database]
-PATH = /data/gitea/gitea.db
-DB_TYPE = sqlite3
-HOST = localhost:3306
-NAME = gitea
-USER = root
-PASSWD = 
-LOG_SQL = false
-SCHEMA = 
-SSL_MODE = disable
-
-[indexer]
-ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve
-
-[session]
-PROVIDER_CONFIG = /data/gitea/sessions
-PROVIDER = file
-
-[picture]
-AVATAR_UPLOAD_PATH = /data/gitea/avatars
-REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars
-
-[attachment]
-PATH = /data/gitea/attachments
-
-[log]
-MODE = console
-LEVEL = info
-ROOT_PATH = /data/gitea/log
-
-[security]
-INSTALL_LOCK = true
-SECRET_KEY = 
-REVERSE_PROXY_LIMIT = 1
-REVERSE_PROXY_TRUSTED_PROXIES = *
-INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2OTU3NDkwOTd9.VhubdZ2bMMSXA7x5SEMo-ctXBnVTQPlHNbKJEZe2ZzI
-PASSWORD_HASH_ALGO = pbkdf2_hi
-
-[service]
-DISABLE_REGISTRATION = false
-REQUIRE_SIGNIN_VIEW = false
-REGISTER_EMAIL_CONFIRM = false
-ENABLE_NOTIFY_MAIL = false
-ALLOW_ONLY_EXTERNAL_REGISTRATION = false
-ENABLE_CAPTCHA = false
-DEFAULT_KEEP_EMAIL_PRIVATE = false
-DEFAULT_ALLOW_CREATE_ORGANIZATION = true
-DEFAULT_ENABLE_TIMETRACKING = true
-NO_REPLY_ADDRESS = noreply.localhost
-
-[lfs]
-PATH = /data/git/lfs
-
-[mailer]
-ENABLED = false
-
-[openid]
-ENABLE_OPENID_SIGNIN = true
-ENABLE_OPENID_SIGNUP = true
-
-[cron.update_checker]
-ENABLED = false
-
-[repository.pull-request]
-DEFAULT_MERGE_STYLE = merge
-
-[repository.signing]
-DEFAULT_TRUST_MODEL = committer
-
-[oauth2]
-JWT_SECRET = 6XKGvhqiFK0oXo8wckWPZDS5_0BlO4dSATDXkh6BLlY
-
-[federation]
-ENABLED = true
diff --git a/targets/forgejo/docker-compose.yml b/targets/forgejo/docker-compose.yml
index 3f94006..99f2c23 100644
--- a/targets/forgejo/docker-compose.yml
+++ b/targets/forgejo/docker-compose.yml
@@ -5,7 +5,10 @@ services:
     image: codeberg.org/forgejo/forgejo:1.20
     container_name: forgejo
     environment:
-      - USER_UID=1001
+      - FORGEJO__security__INSTALL_LOCK=true
+      - FORGEJO__federation__ENABLED=true
+      - FORGEJO__server__ROOT_URL=http://forgejo
+      - FORGEJO__server__HTTP_PORT=80
     restart: always
     networks:
       - ftest
@@ -13,7 +16,6 @@ services:
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      - ./conf/app.ini:/data/gitea/conf/app.ini:wo
     ports:
       - "7000:80"
       - "2222:22"
-- 
2.39.5