From 5e6bcfa39abda2429bd6bcea926e8a1b2937da93 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 7 Jan 2022 00:09:47 +0100 Subject: [PATCH] Upgrade env for 1.2.1 --- conf/env.prod | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/conf/env.prod b/conf/env.prod index 87a3eb9..2675520 100644 --- a/conf/env.prod +++ b/conf/env.prod @@ -5,7 +5,7 @@ # following variables: # - DJANGO_SECRET_KEY # - FUNKWHALE_HOSTNAME -# - EMAIL_CONFIG and DEFAULT_FROM_EMAIL if you plan to send emails) +# - EMAIL_CONFIG and DEFAULT_FROM_EMAIL if you plan to send e-mails) # On non-docker setup **only**, you'll also have to tweak/uncomment those variables: # - DATABASE_URL # - CACHE_URL @@ -43,21 +43,30 @@ FUNKWHALE_WEB_WORKERS=6 FUNKWHALE_HOSTNAME=__DOMAIN__ FUNKWHALE_PROTOCOL=https -# Configure email sending using this variale -# By default, funkwhale will output emails sent to stdout +# Log level (debug, info, warning, error, critical) +LOGLEVEL=error + +# Configure e-mail sending using this variale +# By default, funkwhale will output e-mails sent to stdout # here are a few examples for this setting -# EMAIL_CONFIG=consolemail:// # output emails to console (the default) -# EMAIL_CONFIG=dummymail:// # disable email sending completely +# EMAIL_CONFIG=consolemail:// # output e-mails to console (the default) +# EMAIL_CONFIG=dummymail:// # disable e-mail sending completely # On a production instance, you'll usually want to use an external SMTP server: +# If `user` or `password` contain special characters (eg. +# `noreply@youremail.host` as `user`), be sure to urlencode them, using +# for example the command: +# `python3 -c 'import urllib.parse; print(urllib.parse.quote_plus +# ("noreply@youremail.host"))'` +# (returns `noreply%40youremail.host`) # EMAIL_CONFIG=smtp://user@:password@youremail.host:25 # EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465 # EMAIL_CONFIG=smtp+tls://user@:password@youremail.host:587 -# Make email verification mandatory before using the service +# Make e-mail verification mandatory before using the service # Doesn't apply to admins. # ACCOUNT_EMAIL_VERIFICATION_ENFORCE=false -# The email address to use to send system emails. +# The e-mail address to use to send system e-mails. # DEFAULT_FROM_EMAIL=noreply@yourdomain # Depending on the reverse proxy used in front of your funkwhale instance, @@ -119,13 +128,6 @@ DJANGO_SECRET_KEY=__KEY__ # want to # DJANGO_ADMIN_URL=^api/admin/ -# Sentry/Raven error reporting (server side) -# Enable Raven if you want to help improve funkwhale by -# automatically sending error reports our Sentry instance. -# This will help us detect and correct bugs -RAVEN_ENABLED=false -RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5 - # In-place import settings # You can safely leave those settings uncommented if you don't plan to use # in place imports. @@ -178,7 +180,7 @@ NGINX_MAX_BODY_SIZE=100M # AWS_S3_ENDPOINT_URL= # If you want to serve media directly from your S3 bucket rather than through a proxy, -# set this to true +# set this to false # PROXY_MEDIA=false # If you are using Amazon S3 to serve media directly, you will need to specify your region