From 1a49216b0272a852ad7118f5bd5d66c30bd983ef Mon Sep 17 00:00:00 2001 From: Youssef Date: Thu, 6 Aug 2026 22:10:19 +0200 Subject: [PATCH] chore: update mail configuration for Brevo SMTP and Gitea secrets --- .env.example | 19 +++++++++++++++++++ .gitea/workflows/ci-prod.yml | 10 ++++++++++ .gitea/workflows/ci-test.yml | 10 ++++++++++ .../src/main/resources/application.yml | 11 +++++++++-- docker-compose.yml | 8 ++++++-- 5 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..bbb421d --- /dev/null +++ b/.env.example @@ -0,0 +1,19 @@ +# Configuration Base de données +POSTGRES_USER=myuser +POSTGRES_PASSWORD=mypassword + +# Configuration Email Brevo (SMTP Relay) +# 1. Host: smtp-relay.brevo.com (ou smtp-relay.sendinblue.com) +# 2. Port: 587 (TLS/STARTTLS) ou 465 (SSL) +# 3. Username: Votre identifiant SMTP Brevo (visible dans Brevo > SMTP & API > SMTP) +# 4. Password: Votre clef SMTP Brevo (Master Key ou Clef SMTP générée dans Brevo) +SPRING_MAIL_HOST=smtp-relay.brevo.com +SPRING_MAIL_PORT=587 +SPRING_MAIL_USERNAME=votre_login_smtp_brevo@exemple.com +SPRING_MAIL_PASSWORD=xsmtpsib-votre_cle_smtp_brevo +SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true +SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true + +# Configuration Captcha (si applicable) +CAPTCHA_SITEKEY= +CAPTCHA_SECRET= diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml index 6bd0798..e601f79 100644 --- a/.gitea/workflows/ci-prod.yml +++ b/.gitea/workflows/ci-prod.yml @@ -51,11 +51,21 @@ jobs: PROD_DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }} CAPTCHA_SECRET: ${{ secrets.CAPTCHA_SECRET }} CAPTCHA_SITEKEY: ${{ secrets.CAPTCHA_SITEKEY }} + MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }} + MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }} run: | echo "POSTGRES_USER=${PROD_DB_USER:-myuser}" > .env echo "POSTGRES_PASSWORD=${PROD_DB_PASSWORD:-mypassword}" >> .env echo "CAPTCHA_SECRET=${CAPTCHA_SECRET:-1x0000000000000000000000000000000AA}" >> .env echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env + if [ -n "${MAIL_USERNAME}" ]; then + echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env + echo "SPRING_MAIL_PORT=587" >> .env + echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env + echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env + echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env + echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env + fi docker compose down app || true docker compose up -d --build app diff --git a/.gitea/workflows/ci-test.yml b/.gitea/workflows/ci-test.yml index 2a3e84f..73216a0 100644 --- a/.gitea/workflows/ci-test.yml +++ b/.gitea/workflows/ci-test.yml @@ -47,11 +47,21 @@ jobs: env: DB_USER: ${{ secrets.DB_USER }} DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }} + MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }} run: | echo "POSTGRES_USER=${DB_USER:-myuser}" > .env echo "POSTGRES_PASSWORD=${DB_PASSWORD:-mypassword}" >> .env echo "CAPTCHA_SECRET=1x0000000000000000000000000000000AA" >> .env echo "CAPTCHA_SITEKEY=1x00000000000000000000AA" >> .env + if [ -n "${MAIL_USERNAME}" ]; then + echo "SPRING_MAIL_HOST=smtp-relay.brevo.com" >> .env + echo "SPRING_MAIL_PORT=587" >> .env + echo "SPRING_MAIL_USERNAME=${MAIL_USERNAME}" >> .env + echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env + echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env + echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env + fi docker compose down app || true docker compose up -d --build app diff --git a/as-talange-web/src/main/resources/application.yml b/as-talange-web/src/main/resources/application.yml index c67ceb8..ee272af 100644 --- a/as-talange-web/src/main/resources/application.yml +++ b/as-talange-web/src/main/resources/application.yml @@ -20,12 +20,14 @@ spring: mail: host: ${SPRING_MAIL_HOST:localhost} port: ${SPRING_MAIL_PORT:1025} + username: ${SPRING_MAIL_USERNAME:} + password: ${SPRING_MAIL_PASSWORD:} properties: mail: smtp: - auth: false + auth: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:false} starttls: - enable: false + enable: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:false} server: port: 8080 @@ -35,3 +37,8 @@ app: sporteasy: base-url: https://www.sporteasy.net/join/ + +logging: + level: + com.astalange: DEBUG + diff --git a/docker-compose.yml b/docker-compose.yml index 7d32999..af7aabf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,8 +43,12 @@ services: - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/astalange - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER:-myuser} - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD:-mypassword} - - SPRING_MAIL_HOST=mailpit - - SPRING_MAIL_PORT=1025 + - SPRING_MAIL_HOST=${SPRING_MAIL_HOST:-mailpit} + - SPRING_MAIL_PORT=${SPRING_MAIL_PORT:-1025} + - SPRING_MAIL_USERNAME=${SPRING_MAIL_USERNAME:-} + - SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD:-} + - SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:-false} + - SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:-false} - CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-} - CAPTCHA_SECRET=${CAPTCHA_SECRET:-} depends_on: