From 46b6b9a8a466d1ef7e66244b53e7634f910c9d54 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 27 Sep 2024 10:05:33 +0200 Subject: [PATCH 1/2] chore(forgejo): Fix mailer tls protocol configuration Update configuration for mailer to use new 'PROTOCOL' configuration option instead of old 'IS_TLS_ENABLED'. --- roles/forgejo/defaults/main.yml | 2 +- roles/forgejo/templates/docker-stack.yml.j2 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml index 0b7ce48..af97878 100644 --- a/roles/forgejo/defaults/main.yml +++ b/roles/forgejo/defaults/main.yml @@ -21,7 +21,7 @@ forgejo_app_admin_email: myadmin@mydomain.mytld # forgejo_smtp_port: 465 # forgejo_smtp_username: my@username.com # forgejo_smtp_password: -# forgejo_smtp_force_tls: false # forces tls if it is on a non-traditional tls port. Overwrites starttls so should generally be off +# forgejo_smtp_protocol: smtps # can be one of starttls | smtps forgejo_use_lfs: false forgejo_lfs_max_filesize: 0 diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2 index a035a74..fe10ec7 100644 --- a/roles/forgejo/templates/docker-stack.yml.j2 +++ b/roles/forgejo/templates/docker-stack.yml.j2 @@ -36,7 +36,9 @@ services: - FORGEJO__mailer__TYPE=smtp - FORGEJO__mailer__SMTP_ADDR={{ forgejo_smtp_addr }} - FORGEJO__mailer__SMTP_PORT={{ forgejo_smtp_port }} - - FORGEJO__mailer__IS_TLS_ENABLED={{ (forgejo_smtp_force_tls is not undefined and not None) | ternary(forgejo_smtp_force_tls,'false') }} +{% if forgejo_smtp_protocol is not undefined and not none %} + - FORGEJO__mailer__PROTOCOL={{ forgejo_smtp_protocol }} +{% endif %} - FORGEJO__mailer__USER={{ forgejo_smtp_username }} - FORGEJO__mailer__PASSWD={{ forgejo_smtp_password }} {% endif %} From a6b8e6ffcdfcec2d758e7310cedcd01693d8e6c0 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 27 Sep 2024 10:43:17 +0200 Subject: [PATCH 2/2] chore(forgejo): Update to forgejo 8 --- roles/forgejo/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml index af97878..150cac1 100644 --- a/roles/forgejo/defaults/main.yml +++ b/roles/forgejo/defaults/main.yml @@ -1,5 +1,5 @@ --- -forgejo_version: 7 +forgejo_version: 8 forgejo_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}"