diff --git a/.env.example b/.env.example index ab8416b82..2d890f9eb 100644 --- a/.env.example +++ b/.env.example @@ -9,7 +9,7 @@ FUNKWHALE_DOMAIN=funkwhale.test FUNKWHALE_PROTOCOL=https DJANGO_SECRET_KEY=dev -DJANGO_ALLOWED_HOSTS=.funkwhale.test,nginx +DJANGO_ALLOWED_HOSTS=.funkwhale.test,web DJANGO_SETTINGS_MODULE=config.settings.local DATABASE_URL=postgresql://postgres@postgres/postgres @@ -26,11 +26,11 @@ PYTHONTRACEMALLOC=0 # api -FUNKWHALE_SPA_HTML_ROOT=http://nginx/ +FUNKWHALE_SPA_HTML_ROOT=${FUNKWHALE_PROTOCOL}://${FUNKWHALE_DOMAIN} LDAP_ENABLED=False BROWSABLE_API_ENABLED=True -# api + nginx +# api + web STATIC_ROOT=/staticfiles MEDIA_ROOT=/data/media @@ -38,12 +38,12 @@ MEDIA_ROOT=/data/media # api + Typesense TYPESENSE_API_KEY=apikey -# front +# app HOST=0.0.0.0 VUE_PORT=8080 -# nginx +# web NGINX_MAX_BODY_SIZE=10G diff --git a/compose.yml b/compose.yml index a8ef017d4..7c3d86814 100644 --- a/compose.yml +++ b/compose.yml @@ -30,10 +30,10 @@ services: service: worker <<: *django - nginx: + web: extends: file: ./compose/app.nginx.yml - service: nginx + service: web depends_on: app: condition: service_healthy diff --git a/compose/app.nginx.yml b/compose/app.nginx.yml index 4d50c1cbe..c926793e9 100644 --- a/compose/app.nginx.yml +++ b/compose/app.nginx.yml @@ -1,5 +1,5 @@ services: - nginx: + web: image: nginx networks: - internal