From 041aa75a0deebec21bd1d1d7f891f5b25984022f Mon Sep 17 00:00:00 2001 From: muppeth Date: Tue, 3 Sep 2024 21:01:13 +0200 Subject: [PATCH] 8.0.2 (#57) Co-authored-by: meaz Reviewed-on: https://git.disroot.org/Disroot-Ansible/forgejo/pulls/57 Reviewed-by: meaz Co-authored-by: muppeth Co-committed-by: muppeth --- defaults/main.yml | 8 +++++++- templates/etc/forgejo/app.ini.j2 | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 8ebc302..3e49e2b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,7 +7,7 @@ forgejo_group: 'git' forgejo_confdir: '/etc/forgejo/app.ini' forgejo_dump_path: '/srv/forgejo-dump' forgejo_flavor: 'forgejo' -forgejo_version: '8.0.1' +forgejo_version: '8.0.2' #forgejo_version: '1.21.7-0' forgejo_arch: 'linux-amd64' #forgejo_download_url: 'https://github.com/go-gitea/gitea/releases/download/v{{ forgejo_version }}/gitea-{{ forgejo_version }}-{{ forgejo_arch }}' @@ -31,6 +31,12 @@ forgejo_base_config: forgejo_oauth2_config: - 'JWT_SECRET = ' #41 random chars +forgejo_oauth2_client_config: + - 'ENABLE_AUTO_REGISTRATION = false' + - 'REGISTER_EMAIL_CONFIRM = false' + - 'ACCOUNT_LINKING = login' + - 'UPDATE_AVATAR = false' + forgejo_ui_config: - 'THEMES = gitea-auto,gitea-light,gitea-dark,forgejo-auto,forgejo-light,forgejo-dark' # add only the default ones, not themes ones - 'DEFAULT_THEME = gitea-dark' diff --git a/templates/etc/forgejo/app.ini.j2 b/templates/etc/forgejo/app.ini.j2 index 4aef931..4b85898 100644 --- a/templates/etc/forgejo/app.ini.j2 +++ b/templates/etc/forgejo/app.ini.j2 @@ -8,6 +8,11 @@ {{ item }} {% endfor %} +[oauth2_client] +{% for item in forgejo_oauth2_client_config %} +{{ item }} +{% endfor %} + [ui] {% for item in forgejo_ui_config %} {{ item }} @@ -65,7 +70,6 @@ {{ item }} {% endfor %} - [session] {% for item in forgejo_session_config %} {{ item }}