Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
funkwhale
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Auri
funkwhale
Commits
409b076c
Verified
Commit
409b076c
authored
Nov 25, 2018
by
Eliot Berriot
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed the need to specify the DJANGO_ALLOWED_HOSTS variable
parent
f07d6964
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
9 deletions
+2
-9
.gitlab-ci.yml
.gitlab-ci.yml
+0
-1
api/config/settings/common.py
api/config/settings/common.py
+1
-1
changes/changelog.d/allowed-hosts.enhancement
changes/changelog.d/allowed-hosts.enhancement
+1
-0
demo/env.sample
demo/env.sample
+0
-1
deploy/env.prod.sample
deploy/env.prod.sample
+0
-6
No files found.
.gitlab-ci.yml
View file @
409b076c
...
...
@@ -140,7 +140,6 @@ test_api:
paths
:
-
"
$PIP_CACHE_DIR"
variables
:
DJANGO_ALLOWED_HOSTS
:
"
localhost"
DATABASE_URL
:
"
postgresql://postgres@postgres/postgres"
FUNKWHALE_URL
:
"
https://funkwhale.ci"
DJANGO_SETTINGS_MODULE
:
config.settings.local
...
...
api/config/settings/common.py
View file @
409b076c
...
...
@@ -60,7 +60,7 @@ FEDERATION_MUSIC_NEEDS_APPROVAL = env.bool(
)
# XXX: deprecated, see #186
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
# ------------------------------------------------------------------------------
...
...
changes/changelog.d/allowed-hosts.enhancement
0 → 100644
View file @
409b076c
Removed the need to specify the DJANGO_ALLOWED_HOSTS variable
demo/env.sample
View file @
409b076c
FUNKWHALE_URL=https://demo.funkwhale.audio/
DJANGO_ALLOWED_HOSTS=demo.funkwhale.audio
FUNKWHALE_API_PORT=5001
DJANGO_SECRET_KEY=demo
DATABASE_URL=postgresql://postgres@postgres/postgres
...
...
deploy/env.prod.sample
View file @
409b076c
...
...
@@ -4,7 +4,6 @@
# If you're tweaking this file from the template, ensure you edit at least the
# following variables:
# - DJANGO_SECRET_KEY
# - DJANGO_ALLOWED_HOSTS
# - FUNKWHALE_HOSTNAME
# - 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:
...
...
@@ -85,11 +84,6 @@ MEDIA_ROOT=/srv/funkwhale/data/media
# (Ensure this directory actually exists)
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?
# You don't have to touch this unless you really know what you're doing
DJANGO_SETTINGS_MODULE=config.settings.production
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment