Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
funkwhale
funkwhale
Commits
80cfd718
Commit
80cfd718
authored
Jun 26, 2017
by
Eliot Berriot
Browse files
Fixed #20: added admin serving under /api/, minor tweaks to production nginx and env file
parent
e7c8cad6
Changes
3
Show whitespace changes
Inline
Side-by-side
api/config/settings/common.py
View file @
80cfd718
...
...
@@ -199,7 +199,7 @@ CRISPY_TEMPLATE_PACK = 'bootstrap3'
STATIC_ROOT
=
str
(
ROOT_DIR
(
'staticfiles'
))
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
STATIC_URL
=
env
(
"STATIC_URL"
,
default
=
'/static/'
)
STATIC_URL
=
env
(
"STATIC_URL"
,
default
=
'/static
files
/'
)
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
STATICFILES_DIRS
=
(
...
...
deploy/env.prod.sample
View file @
80cfd718
...
...
@@ -30,7 +30,7 @@ DJANGO_SETTINGS_MODULE=config.settings.production
DJANGO_SECRET_KEY=
# You don't have to edit this
DJANGO_ADMIN_URL=^admin/
DJANGO_ADMIN_URL=^
api/
admin/
# Update it to match the domain that will be used to reach your funkwhale
# instance
...
...
deploy/nginx.conf
View file @
80cfd718
...
...
@@ -20,7 +20,7 @@ server {
proxy_set_header
Host
$host
;
proxy_set_header
X-Real-IP
$remote_addr
;
proxy_set_header
X-Forwarded-For
$proxy_add_x_forwarded_for
;
proxy_set_header
X-Forwarded-Proto
https
;
proxy_set_header
X-Forwarded-Proto
$scheme
;
proxy_redirect
off
;
proxy_pass
http://funkwhale-api/api/
;
}
...
...
@@ -28,6 +28,6 @@ server {
alias
/srv/funkwhale/data/media/
;
}
location
/staticfiles/
{
alias
/srv/funkwhale/data/static
files
/
;
alias
/srv/funkwhale/data/static/
;
}
}
Write
Preview
Supports
Markdown
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