hosting/cloudserve-infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chore(forgejo): Fix mailer tls protocol configuration

Browse source 
Update configuration for mailer to use new 'PROTOCOL' configuration
option instead of old 'IS_TLS_ENABLED'.
This commit is contained in:
Marty Oehme 2024-09-27 10:05:33 +02:00
parent 409f50a5ef
commit 46b6b9a8a4
Signed by: Marty
GPG key ID: EDBF2ED917B2EF6A
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/forgejo/defaults/main.yml
View file

@ -21,7 +21,7 @@ forgejo_app_admin_email: myadmin@mydomain.mytld
# forgejo_smtp_port: 465
# forgejo_smtp_username: my@username.com
# forgejo_smtp_password: <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

4
roles/forgejo/templates/docker-stack.yml.j2
View file

@ -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 %}