From 8f5fcec3a9bf8684eae5fee31f476790f63470cd Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 21 Feb 2023 12:44:00 +0100
Subject: [PATCH] feat(Gitea): Update configuration

---
 gitea/.env                    | 36 +++++++++++++++++++++--------------
 gitea/docker-compose.smtp.yml |  1 -
 gitea/docker-compose.yml      |  6 ++++--
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/gitea/.env b/gitea/.env
index 3db8400..2b34046 100644
--- a/gitea/.env
+++ b/gitea/.env
@@ -1,26 +1,34 @@
-COMPOSE_FILE=../postgres/docker-compose.yml:./docker-compose.yml:./docker-compose.override.yml
+########
+# DOCKER
 
-# APP
+SERVICES_DIR=".."
+COMPOSE_FILE=${SERVICES_DIR}/gitea/docker-compose.yml:${SERVICES_DIR}/gitea/docker-compose.traefik.yml:${SERVICES_DIR}/gitea/docker-compose.smtp.yml:${SERVICES_DIR}/gitea/docker-compose.metrics.yml:${SERVICES_DIR}/postgres/docker-compose.yml
+COMPOSE_PROJECT_NAME=$GITEA_DOMAIN
 
-GITEA_VOLUME_NAME=gitea
-GITEA_PROTOCOL=http
-GITEA_DOMAIN=gitea.lan
-
-# APP CONFIG
+#######
+# GITEA
 # https://docs.gitea.io/en-us/install-with-docker/#environments-variables
 
-DISABLE_SSH=true
-RUN_MODE=prod
-ROOT_URL=${GITEA_PROTOCOL}://${GITEA_DOMAIN}
-DISABLE_REGISTRATION=true
-DISABLE_GRAVATAR=true
-#INSTALL_LOCK=true
+GITEA_DOMAIN=gitea.lan
+GITEA_VOLUME_NAME=gitea
+GITEA_IMAGE=gitea/gitea:1.18.4
+GITEA_PROTOCOL=http
+GITEA_SECRET_KEY=kt5UdK0m9lI9MDyhVOFEB5jk7VwFynDyaxcUjEJUpWJBrC6FyH4dkUDKLYEa7hGn
+GITEA_INTERNAL_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2NzY5NzkxMzZ9.Iopu6DBUhglmNPzEyYylfmTmEUpYLHYEsNrm50GoBkU
+
+# SMTP
+
+GITEA__mailer__FROM='"Name" <email@example.com>'
+GITEA__mailer__SMTP_ADDR=smtp.gitea.lan
+GITEA__mailer__SMTP_PORT=465
+GITEA__mailer__USER=gitea.lan
+GITEA__mailer__PASSWD=gitea.lan
 
 # DATABASE
-# Voir la description ../postgres/README.md
 
 POSTGRES_USER=user-example
 POSTGRES_PASSWORD=password-example
 POSTGRES_DB=postgres-database-name-example
 POSTGRES_CONTAINER_NAME=gitea-postgres
 POSTGRES_VOLUME_NAME=gitea-postgres
+POSTGRES_IMAGE=postgres:15.2-alpine
diff --git a/gitea/docker-compose.smtp.yml b/gitea/docker-compose.smtp.yml
index f01131d..af25854 100644
--- a/gitea/docker-compose.smtp.yml
+++ b/gitea/docker-compose.smtp.yml
@@ -12,4 +12,3 @@ services:
       - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
 
       - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
-      - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 67eb748..f30608b 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -19,8 +19,10 @@ services:
       - GITEA__database__USER=${POSTGRES_USER}
       - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
       # Security
-      - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY:-}
-      - GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN:-}
+      # docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
+      - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY}
+      # docker run -it --rm  gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
+      - GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN}
     volumes:
       - gitea:/data
       - /etc/timezone:/etc/timezone:ro
-- 
2.40.1