MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(compose/api): use email config URL

This commit is contained in:
jon r 2024-10-11 22:16:49 +02:00
parent 1868b41abd
commit 84fcc4762c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -1,5 +1,6 @@
# api + celeryworker # api + celeryworker
DEBUG=True DEBUG=True
DEFAULT_FROM_EMAIL=hello@funkwhale.test
FUNKWHALE_DOMAIN=funkwhale.test FUNKWHALE_DOMAIN=funkwhale.test
FUNKWHALE_PROTOCOL=https FUNKWHALE_PROTOCOL=https
@ -10,6 +11,7 @@ DJANGO_SETTINGS_MODULE=config.settings.local
DATABASE_URL=postgresql://postgres@postgres/postgres DATABASE_URL=postgresql://postgres@postgres/postgres
CACHE_URL=redis://redis:6379/0 CACHE_URL=redis://redis:6379/0
EMAIL_CONFIG=smtp://mailpit.funkwhale.test:1025
FORCE_HTTPS_URLS=True FORCE_HTTPS_URLS=True
EXTERNAL_REQUESTS_VERIFY_SSL=false EXTERNAL_REQUESTS_VERIFY_SSL=false

5
api/config/settings/local.py
View File

@ -25,11 +25,6 @@ SECRET_KEY = env(
"DJANGO_SECRET_KEY", default="mc$&b=5j#6^bv7tld1gyjp2&+^-qrdy=0sw@r5sua*1zp4fmxc" "DJANGO_SECRET_KEY", default="mc$&b=5j#6^bv7tld1gyjp2&+^-qrdy=0sw@r5sua*1zp4fmxc"
) )
# Mail settings
# ------------------------------------------------------------------------------
EMAIL_HOST = "localhost"
EMAIL_PORT = 1025
# django-debug-toolbar # django-debug-toolbar
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

2
compose.yml
View File

@ -6,6 +6,7 @@ networks:
x-django: &django x-django: &django
environment: environment:
- DEBUG - DEBUG
- DEFAULT_FROM_EMAIL
- DJANGO_SETTINGS_MODULE - DJANGO_SETTINGS_MODULE
- DJANGO_SECRET_KEY - DJANGO_SECRET_KEY
@ -18,6 +19,7 @@ x-django: &django
- DATABASE_URL - DATABASE_URL
- CACHE_URL - CACHE_URL
- EMAIL_CONFIG
- "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/" - "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/"
- "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/" - "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/"