From 22cc266f8ab286da9b207c3b21aa86aa85a29944 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 16 Feb 2019 13:16:00 +0100 Subject: [PATCH] align env.prod with upstream --- conf/env.prod | 10 +++------- manifest.json | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/conf/env.prod b/conf/env.prod index 66d49b2..457c026 100644 --- a/conf/env.prod +++ b/conf/env.prod @@ -40,7 +40,8 @@ FUNKWHALE_API_PORT=__PORT__ # Replace this by the definitive, public domain you will use for # your instance -FUNKWHALE_URL=https://__DOMAIN__ +FUNKWHALE_HOSTNAME=__DOMAIN__ +FUNKWHALE_PROTOCOL=https # Configure email sending using this variale # By default, funkwhale will output emails sent to stdout @@ -86,11 +87,6 @@ MEDIA_ROOT=__FINALPATH__/media # (Ensure this directory actually exists) STATIC_ROOT=__FINALPATH__/code/data/static -# Update it to match the domain that will be used to reach your funkwhale -# instance -# Example: DJANGO_ALLOWED_HOSTS=funkwhale.yourdomain.com -DJANGO_ALLOWED_HOSTS=__DOMAIN__ - # which settings module should django use? # You don't have to touch this unless you really know what you're doing DJANGO_SETTINGS_MODULE=config.settings.production @@ -119,8 +115,8 @@ RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f # MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music # # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed -MUSIC_DIRECTORY_SERVE_PATH=__FINALPATH__/import MUSIC_DIRECTORY_PATH=__FINALPATH__/import +MUSIC_DIRECTORY_SERVE_PATH=__FINALPATH__/import # LDAP settings # Use the following options to allow authentication on your Funkwhale instance diff --git a/manifest.json b/manifest.json index c5200d1..0b3182a 100644 --- a/manifest.json +++ b/manifest.json @@ -41,7 +41,7 @@ "name": "admin", "type": "user", "ask": { - "en": "Choose an admin user for Funkwhale?" + "en": "Choose an admin user for Funkwhale" }, "example": "jibec" }