From 706f3b56e0f6191d5856db62989462f05be938ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= Date: Mon, 24 Jul 2023 18:39:55 +0200 Subject: [PATCH] Fix(Docker): dev set-up Part-of: --- .env.dev | 1 + docker/nginx/conf.dev | 10 +--------- docs/developer/setup/docker.md | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.env.dev b/.env.dev index ca0953da7..7ec5baeef 100644 --- a/.env.dev +++ b/.env.dev @@ -12,6 +12,7 @@ FORWARDED_PROTO=http LDAP_ENABLED=False FUNKWHALE_SPA_HTML_ROOT=http://nginx/ PYTHONTRACEMALLOC=0 +MEDIA_ROOT=/data/media # Uncomment this if you're using traefik/https # FORCE_HTTPS_URLS=True diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev index 05baf5657..fc738ff8e 100644 --- a/docker/nginx/conf.dev +++ b/docker/nginx/conf.dev @@ -92,7 +92,7 @@ http { add_header Content-Security-Policy "connect-src https: http: 'self'; default-src 'self'; script-src 'self' unpkg.com 'unsafe-inline' 'unsafe-eval'; style-src https: http: 'self' 'unsafe-inline'; img-src https: http: 'self' data:; font-src https: http: 'self' data:; object-src 'none'; media-src https: http: 'self' data:"; add_header Referrer-Policy "strict-origin-when-cross-origin"; - proxy_pass http://funkwhale-front/embed.html; + proxy_pass http://funkwhale-front; expires 1d; } @@ -107,14 +107,6 @@ http { proxy_pass http://funkwhale-api/api/subsonic/rest/; } - location /media/__sized__/ { - alias /protected/media/__sized__/; - } - - location /media/attachments/ { - alias /protected/media/attachments/; - } - location /.well-known/ { include /etc/nginx/funkwhale_proxy.conf; proxy_pass http://funkwhale-api; diff --git a/docs/developer/setup/docker.md b/docs/developer/setup/docker.md index 9ebf86c18..06c2ce14c 100644 --- a/docs/developer/setup/docker.md +++ b/docs/developer/setup/docker.md @@ -53,6 +53,7 @@ To set up your Docker environment: ```text MEDIA_URL=http://localhost:8000/media/ STATIC_URL=http://localhost:8000/staticfiles/ + MEDIA_ROOT=/data/media ``` 3. Create a network for federation support