fix: switch Brevo SMTP port to 2525 and configure explicit timeouts to avoid 587 block
This commit is contained in:
@@ -60,7 +60,7 @@ jobs:
|
|||||||
echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env
|
echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env
|
||||||
if [ -n "${MAIL_USERNAME}" ]; then
|
if [ -n "${MAIL_USERNAME}" ]; then
|
||||||
echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env
|
echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env
|
||||||
echo "SPRING_MAIL_PORT=587" >> .env
|
echo "SPRING_MAIL_PORT=${MAIL_PORT:-2525}" >> .env
|
||||||
echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env
|
echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env
|
||||||
echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
|
echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
|
||||||
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
|
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ jobs:
|
|||||||
echo "CAPTCHA_SITEKEY=1x00000000000000000000AA" >> .env
|
echo "CAPTCHA_SITEKEY=1x00000000000000000000AA" >> .env
|
||||||
if [ -n "${MAIL_USERNAME}" ]; then
|
if [ -n "${MAIL_USERNAME}" ]; then
|
||||||
echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env
|
echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env
|
||||||
echo "SPRING_MAIL_PORT=587" >> .env
|
echo "SPRING_MAIL_PORT=${MAIL_PORT:-2525}" >> .env
|
||||||
echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env
|
echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env
|
||||||
echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
|
echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
|
||||||
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
|
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
|
||||||
|
|||||||
@@ -28,6 +28,9 @@ spring:
|
|||||||
auth: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:false}
|
auth: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:false}
|
||||||
starttls:
|
starttls:
|
||||||
enable: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:false}
|
enable: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:false}
|
||||||
|
connectiontimeout: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_CONNECTIONTIMEOUT:5000}
|
||||||
|
timeout: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_TIMEOUT:5000}
|
||||||
|
writetimeout: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_WRITETIMEOUT:5000}
|
||||||
|
|
||||||
server:
|
server:
|
||||||
port: 8080
|
port: 8080
|
||||||
|
|||||||
Reference in New Issue
Block a user