diff --git a/compose.yaml b/compose.yaml index d9c55d826946a8f2aa88d9ee1e5a4b1045391a8b..88b3ba25787f235326e5689c50d0e1668c48ad39 100755 --- a/compose.yaml +++ b/compose.yaml @@ -162,10 +162,11 @@ services: MAILER_ADDRESS: "${MAILER_ADDRESS}" MAILER_USERNAME: "${MAILER_USERNAME}" MAILER_PASSWORD: "${MAILER_PASSWORD}" - FORGEJO_SERVER_LFS_JWT_SECRET: "${FORGEJO_SERVER_LFS_JWT_SECRET}" - FORGEJO_OAUTH2_JWT_SECRET: "${FORGEJO_OAUTH2_JWT_SECRET}" - FORGEJO_SECURITY_SECRET_KEY: "${FORGEJO_SECURITY_SECRET_KEY}" - FORGEJO_SECURITY_INTERNAL_TOKEN: "${FORGEJO_SECURITY_INTERNAL_TOKEN}" + POSTGRES_PASSWORD_FORGEJO: "${POSTGRES_PASSWORD_FORGEJO:?}" + FORGEJO_SERVER_LFS_JWT_SECRET: "${FORGEJO_SERVER_LFS_JWT_SECRET:?}" + FORGEJO_OAUTH2_JWT_SECRET: "${FORGEJO_OAUTH2_JWT_SECRET:?}" + FORGEJO_SECURITY_SECRET_KEY: "${FORGEJO_SECURITY_SECRET_KEY:?}" + FORGEJO_SECURITY_INTERNAL_TOKEN: "${FORGEJO_SECURITY_INTERNAL_TOKEN:?}" restart: unless-stopped volumes: - "${APP_ROOT}/keycloak:/shared-keys:ro" diff --git a/config/forgejo/init/app.ini b/config/forgejo/init/app.ini index 5ca5a0831647aeb7c75b761bdfc948706bf0af75..00b52391831655b0908027e594659ad7fca3b44b 100755 --- a/config/forgejo/init/app.ini +++ b/config/forgejo/init/app.ini @@ -38,15 +38,14 @@ SSH_LISTEN_PORT=22 LFS_JWT_SECRET=$FORGEJO_SERVER_LFS_JWT_SECRET LFS_START_SERVER=true OFFLINE_MODE=true -LANDING_PAGE=/explore/repos +LANDING_PAGE=/clo [database] -PATH=/data/work/gitea.db -DB_TYPE=sqlite3 -HOST=localhost:3306 -NAME=gitea -USER=root -PASSWD= +DB_TYPE=postgres +HOST=postgres:5432 +NAME=forgejo +USER=forgejo +PASSWD=$POSTGRES_PASSWORD_FORGEJO LOG_SQL=false SCHEMA= SSL_MODE=disable