From 7fec94eaec9cd2082ed32ec5828c1739f1a914d6 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sun, 27 Oct 2024 12:15:53 -0400
Subject: [PATCH] chore: publish 3.0.0+1.22.2-rootless release

---
 .env.sample                   | 3 ++-
 abra.sh                       | 2 +-
 app.ini.tmpl                  | 5 +++--
 compose.smtp.yml              | 3 ++-
 compose.yml                   | 2 +-
 release/3.0.0+1.22.2-rootless | 3 +++
 6 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 release/3.0.0+1.22.2-rootless

diff --git a/.env.sample b/.env.sample
index 7ef6a7a9..06f0355c 100644
--- a/.env.sample
+++ b/.env.sample
@@ -51,7 +51,8 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # SMTP Mailer
 # COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 # GITEA_SMTP_MAILER_ENABLED=1
-# GITEA_MAILER_HOST=mail.gandi.net:465
+# GITEA_MAILER_ADDR=mail.gandi.net
+# GITEA_MAILER_PORT=465
 # SECRET_SMTP_PASSWORD_VERSION=v1
 
 # OATH2 Options
diff --git a/abra.sh b/abra.sh
index 61e8dd70..75ba4f25 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v18
+export APP_INI_VERSION=v19
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 
diff --git a/app.ini.tmpl b/app.ini.tmpl
index 896f5b58..39346849 100644
--- a/app.ini.tmpl
+++ b/app.ini.tmpl
@@ -71,11 +71,12 @@ JWT_SECRET = {{ secret "jwt_secret" }}
 [mailer]
 ENABLED        = true
 FROM           = {{ env "GITEA_MAILER_FROM" }}
-HOST           = {{ env "GITEA_MAILER_HOST" }}
+PROTOCOL       = smtps
+SMTP_ADDR      = {{ env "GITEA_MAILER_ADDR" }}
+SMTP_PORT      = {{ env "GITEA_MAILER_PORT" }}
 USER           = {{ env "GITEA_MAILER_USER" }}
 PASSWD         = {{ secret "smtp_password" }}
 MAILER_TYPE    = smtp
-IS_TLS_ENABLED = true
 {{ end }}
 
 {{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}
diff --git a/compose.smtp.yml b/compose.smtp.yml
index c0cf31dd..96d9b15a 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -5,7 +5,8 @@ services:
   app:
     environment:
       - GITEA_MAILER_FROM
-      - GITEA_MAILER_HOST
+      - GITEA_MAILER_ADDR
+      - GITEA_MAILER_PORT
       - GITEA_MAILER_USER
     secrets:
       - smtp_password
diff --git a/compose.yml b/compose.yml
index ac587a4b..99821008 100644
--- a/compose.yml
+++ b/compose.yml
@@ -85,7 +85,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=2.11.0+1.22.2-rootless
+        - coop-cloud.${STACK_NAME}.version=3.0.0+1.22.2-rootless
 
 
 networks:
diff --git a/release/3.0.0+1.22.2-rootless b/release/3.0.0+1.22.2-rootless
new file mode 100644
index 00000000..50ac4393
--- /dev/null
+++ b/release/3.0.0+1.22.2-rootless
@@ -0,0 +1,3 @@
+BEWARE! 🚨 This release updates to the newer Gitea SMTP settings format.
+
+If you are using SMTP, you will need to split the old GITEA_MAILER_HOST into separate GITEA_MAILER_ADDR (hostname) and GITEA_MAILER_PORT settings.