diff --git a/.env.sample b/.env.sample index 957f4cb..9accacd 100644 --- a/.env.sample +++ b/.env.sample @@ -31,3 +31,11 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # GITEA_SMTP_MAILER_ENABLED=1 # GITEA_MAILER_HOST=mail.gandi.net:465 # SECRET_SMTP_PASSWORD_VERSION=v1 + +# OATH2 Options +# GITEA_REGISTER_EMAIL_CONFIRM=replace-me +# GITEA_REGISTER_EMAIL_CONFIRM=replace-me +# GITEA_OAUTH2_USERNAME=replace-me +# GITEA_UPDATE_AVATAR=replace-me +# GITEA_ACCOUNT_LINKING=replace-me +# GITEA_OAUTH2_CLIENT_ENABLED=replace-me diff --git a/abra.sh b/abra.sh index 29b9c29..2583802 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v8 +export APP_INI_VERSION=v9 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { diff --git a/app.ini.tmpl b/app.ini.tmpl index 64f01ef..ec30369 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -57,6 +57,15 @@ MAILER_TYPE = smtp IS_TLS_ENABLED = true {{ end }} +{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }} +[oauth2_client] +REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }} +ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }} +USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }} +UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }} +ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }} +{{ end }} + [markup.restructuredtext] ENABLED = true FILE_EXTENSIONS = .rst diff --git a/compose.yml b/compose.yml index 16db624..a94b4e2 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.17.2-rootless" + image: "gitea/gitea:1.17.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -32,6 +32,12 @@ services: - GITEA_SSH_PORT - GITEA_DISABLE_GRAVATAR - GITEA_ENABLE_FEDERATED_AVATAR + - GITEA_REGISTER_EMAIL_CONFIRM + - GITEA_ENABLE_AUTO_REGISTRATION + - GITEA_OAUTH2_USERNAME + - GITEA_UPDATE_AVATAR + - GITEA_ACCOUNT_LINKING + - GITEA_OAUTH2_CLIENT_ENABLED volumes: - data:/var/lib/gitea - config:/etc/gitea @@ -53,10 +59,10 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless + - coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless db: - image: "mariadb:10.6" + image: "mariadb:10.9" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: