From b84edcbe757ffc4017d997712c07036228fa676a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 7 Jan 2025 11:21:25 -0300
Subject: [PATCH] feat: support other smtp protocols

---
 .env.sample      | 1 +
 abra.sh          | 2 +-
 app.ini.tmpl     | 2 +-
 compose.smtp.yml | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index 06f0355..1b5fb71 100644
--- a/.env.sample
+++ b/.env.sample
@@ -54,6 +54,7 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_MAILER_ADDR=mail.gandi.net
 # GITEA_MAILER_PORT=465
 # SECRET_SMTP_PASSWORD_VERSION=v1
+# GITEA_MAILER_PROTOCOL=smtps
 
 # OATH2 Options
 # GITEA_REGISTER_EMAIL_CONFIRM=replace-me
diff --git a/abra.sh b/abra.sh
index 75ba4f2..72c6ada 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v19
+export APP_INI_VERSION=v20
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 
diff --git a/app.ini.tmpl b/app.ini.tmpl
index 3934684..ae5b998 100644
--- a/app.ini.tmpl
+++ b/app.ini.tmpl
@@ -71,7 +71,7 @@ JWT_SECRET = {{ secret "jwt_secret" }}
 [mailer]
 ENABLED        = true
 FROM           = {{ env "GITEA_MAILER_FROM" }}
-PROTOCOL       = smtps
+PROTOCOL       = {{ env "GITEA_MAILER_PROTOCOL" }}
 SMTP_ADDR      = {{ env "GITEA_MAILER_ADDR" }}
 SMTP_PORT      = {{ env "GITEA_MAILER_PORT" }}
 USER           = {{ env "GITEA_MAILER_USER" }}
diff --git a/compose.smtp.yml b/compose.smtp.yml
index 96d9b15..60ac7d0 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -8,6 +8,7 @@ services:
       - GITEA_MAILER_ADDR
       - GITEA_MAILER_PORT
       - GITEA_MAILER_USER
+      - GITEA_MAILER_PROTOCOL
     secrets:
       - smtp_password