From 84fcc4762c0e6137ac24daf05a3d2476014f6f3d Mon Sep 17 00:00:00 2001
From: jon r <jon@allmende.io>
Date: Fri, 11 Oct 2024 22:16:49 +0200
Subject: [PATCH] feat(compose/api): use email config URL

---
 .env.example                 | 2 ++
 api/config/settings/local.py | 5 -----
 compose.yml                  | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 7ca69eba4..e7ffef858 100644
--- a/.env.example
+++ b/.env.example
@@ -1,5 +1,6 @@
 # api + celeryworker
 DEBUG=True
+DEFAULT_FROM_EMAIL=hello@funkwhale.test
 
 FUNKWHALE_DOMAIN=funkwhale.test
 FUNKWHALE_PROTOCOL=https
@@ -10,6 +11,7 @@ DJANGO_SETTINGS_MODULE=config.settings.local
 
 DATABASE_URL=postgresql://postgres@postgres/postgres
 CACHE_URL=redis://redis:6379/0
+EMAIL_CONFIG=smtp://mailpit.funkwhale.test:1025
 
 FORCE_HTTPS_URLS=True
 EXTERNAL_REQUESTS_VERIFY_SSL=false
diff --git a/api/config/settings/local.py b/api/config/settings/local.py
index f17af2a22..bcaf6b0d7 100644
--- a/api/config/settings/local.py
+++ b/api/config/settings/local.py
@@ -25,11 +25,6 @@ SECRET_KEY = env(
     "DJANGO_SECRET_KEY", default="mc$&b=5j#6^bv7tld1gyjp2&+^-qrdy=0sw@r5sua*1zp4fmxc"
 )
 
-# Mail settings
-# ------------------------------------------------------------------------------
-EMAIL_HOST = "localhost"
-EMAIL_PORT = 1025
-
 # django-debug-toolbar
 # ------------------------------------------------------------------------------
 
diff --git a/compose.yml b/compose.yml
index 88ed469fb..975f3c200 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,6 +6,7 @@ networks:
 x-django: &django
   environment:
     - DEBUG
+    - DEFAULT_FROM_EMAIL
 
     - DJANGO_SETTINGS_MODULE
     - DJANGO_SECRET_KEY
@@ -18,6 +19,7 @@ x-django: &django
 
     - DATABASE_URL
     - CACHE_URL
+    - EMAIL_CONFIG
 
     - "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/"
     - "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/"