roles/forgejo/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-forgejo_version: 8
+forgejo_version: 7
 
 forgejo_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}"
 
@@ -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_protocol: smtps # can be one of starttls | smtps
+# forgejo_smtp_force_tls: false # forces tls if it is on a non-traditional tls port. Overwrites starttls so should generally be off
 
 forgejo_use_lfs: false
 forgejo_lfs_max_filesize: 0

roles/forgejo/templates/docker-stack.yml.j2

@@ -36,9 +36,7 @@ services:
       - FORGEJO__mailer__TYPE=smtp
       - FORGEJO__mailer__SMTP_ADDR={{ forgejo_smtp_addr }}
       - FORGEJO__mailer__SMTP_PORT={{ forgejo_smtp_port }}
-{% if forgejo_smtp_protocol is not undefined and not none %}
-      - FORGEJO__mailer__PROTOCOL={{ forgejo_smtp_protocol }}
-{% endif %}
+      - FORGEJO__mailer__IS_TLS_ENABLED={{ (forgejo_smtp_force_tls is not undefined and not None) | ternary(forgejo_smtp_force_tls,'false') }}
       - FORGEJO__mailer__USER={{ forgejo_smtp_username }}
       - FORGEJO__mailer__PASSWD={{ forgejo_smtp_password }}
 {% endif %}