Commit 80cfd718 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fixed #20: added admin serving under /api/, minor tweaks to production nginx and env file

parent e7c8cad6
......@@ -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='/staticfiles/')
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
STATICFILES_DIRS = (
......
......@@ -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
......
......@@ -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/staticfiles/;
alias /srv/funkwhale/data/static/;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment