From 3e23a8b9d695f053ba0d7ad846c7978a96d9eb07 Mon Sep 17 00:00:00 2001
From: Andreas Dueren <andreas@due.ren>
Date: Wed, 22 Oct 2025 09:12:46 -0600
Subject: [PATCH] Revert to port 2525 without authentication for internal mail
 relay

The STARTTLS port 2587 requires TLS certificate verification, but
Cloudron's internal mail relay uses a wildcard cert for *.due.ren
which doesn't match the hostname 'mail'. Port 2525 is the internal
plain SMTP relay that doesn't require authentication or TLS for
connections from within the same container network.
---
 CloudronManifest.json | 2 +-
 start.sh              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CloudronManifest.json b/CloudronManifest.json
index ab49f3d..031a534 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -7,7 +7,7 @@
   "contactEmail": "contact@ente.io",
   "website": "https://ente.io",
   "tagline": "Open source, end-to-end encrypted photo backup",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "upstreamVersion": "git-main",
   "healthCheckPath": "/health",
   "httpPort": 3080,
diff --git a/start.sh b/start.sh
index 43aa44f..bb21c17 100755
--- a/start.sh
+++ b/start.sh
@@ -123,10 +123,10 @@ JWT_SECRET_FILE="$SECRETS_DIR/jwt_secret"
 SESSION_SECRET_FILE="$SECRETS_DIR/session_secret"
 
 SMTP_HOST="${CLOUDRON_MAIL_SMTP_SERVER:-mail}"
-SMTP_PORT="${CLOUDRON_MAIL_STARTTLS_PORT:-2587}"
+SMTP_PORT="${CLOUDRON_MAIL_SMTP_PORT:-2525}"
 SMTP_ENCRYPTION=""
-SMTP_USERNAME="${CLOUDRON_MAIL_SMTP_USERNAME:-}"
-SMTP_PASSWORD="${CLOUDRON_MAIL_SMTP_PASSWORD:-}"
+SMTP_USERNAME=""
+SMTP_PASSWORD=""
 SMTP_EMAIL="${CLOUDRON_MAIL_FROM:-no-reply@$RP_ID}"
 SMTP_SENDER_NAME="${CLOUDRON_MAIL_FROM_DISPLAY_NAME:-Ente}"