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

Removed the need to specify the DJANGO_ALLOWED_HOSTS variable

This commit is contained in:
Eliot Berriot 2018-11-25 18:40:56 +01:00
parent f07d696445
commit 409b076c23
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -140,7 +140,6 @@ test_api:
paths: paths:
- "$PIP_CACHE_DIR" - "$PIP_CACHE_DIR"
variables: variables:
DJANGO_ALLOWED_HOSTS: "localhost"
DATABASE_URL: "postgresql://postgres@postgres/postgres" DATABASE_URL: "postgresql://postgres@postgres/postgres"
FUNKWHALE_URL: "https://funkwhale.ci" FUNKWHALE_URL: "https://funkwhale.ci"
DJANGO_SETTINGS_MODULE: config.settings.local DJANGO_SETTINGS_MODULE: config.settings.local

2
api/config/settings/common.py
View File

@ -60,7 +60,7 @@ FEDERATION_MUSIC_NEEDS_APPROVAL = env.bool(
) )
# XXX: deprecated, see #186 # XXX: deprecated, see #186
FEDERATION_ACTOR_FETCH_DELAY = env.int("FEDERATION_ACTOR_FETCH_DELAY", default=60 * 12) FEDERATION_ACTOR_FETCH_DELAY = env.int("FEDERATION_ACTOR_FETCH_DELAY", default=60 * 12)
ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS") ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=[]) + [FUNKWHALE_HOSTNAME]
# APP CONFIGURATION # APP CONFIGURATION
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

1
changes/changelog.d/allowed-hosts.enhancement Normal file
View File

@ -0,0 +1 @@
Removed the need to specify the DJANGO_ALLOWED_HOSTS variable

1
demo/env.sample
View File

@ -1,5 +1,4 @@
FUNKWHALE_URL=https://demo.funkwhale.audio/ FUNKWHALE_URL=https://demo.funkwhale.audio/
DJANGO_ALLOWED_HOSTS=demo.funkwhale.audio
FUNKWHALE_API_PORT=5001 FUNKWHALE_API_PORT=5001
DJANGO_SECRET_KEY=demo DJANGO_SECRET_KEY=demo
DATABASE_URL=postgresql://postgres@postgres/postgres DATABASE_URL=postgresql://postgres@postgres/postgres

6
deploy/env.prod.sample
View File

@ -4,7 +4,6 @@
# If you're tweaking this file from the template, ensure you edit at least the # If you're tweaking this file from the template, ensure you edit at least the
# following variables: # following variables:
# - DJANGO_SECRET_KEY # - DJANGO_SECRET_KEY
# - DJANGO_ALLOWED_HOSTS
# - FUNKWHALE_HOSTNAME # - 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 emails)
# On non-docker setup **only**, you'll also have to tweak/uncomment those variables: # On non-docker setup **only**, you'll also have to tweak/uncomment those variables:
@ -85,11 +84,6 @@ MEDIA_ROOT=/srv/funkwhale/data/media
# (Ensure this directory actually exists) # (Ensure this directory actually exists)
STATIC_ROOT=/srv/funkwhale/data/static STATIC_ROOT=/srv/funkwhale/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=yourdomain
# which settings module should django use? # which settings module should django use?
# You don't have to touch this unless you really know what you're doing # You don't have to touch this unless you really know what you're doing
DJANGO_SETTINGS_MODULE=config.settings.production DJANGO_SETTINGS_MODULE=config.settings.production