diff --git a/abra.sh b/abra.sh index 4b12b3d..d7a5b20 100644 --- a/abra.sh +++ b/abra.sh @@ -1,5 +1,5 @@ -export NGINX_CONFIG_VERSION=v7 -export APP_ENTRYPOINT_VERSION=v4 +export NGINX_CONFIG_VERSION=v9 +export APP_ENTRYPOINT_VERSION=v5 secrets() { docker context use default > /dev/null 2>&1 diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index f0c7f16..05a6318 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -29,6 +29,9 @@ export DATABASE_URL="postgres://funkwhale:$DATABASE_PASSWORD@db:5432/funkwhale" file_env "DJANGO_SECRET_KEY" +# https://dev.funkwhale.audio/funkwhale/funkwhale/-/issues/1784 +cp -r frontend/* /srv/funkwhale/front/dist + # upstream entrypoint # https://dev.funkwhale.audio/funkwhale/funkwhale/-/blob/develop/api/Dockerfile /app/compose/django/entrypoint.sh "$@" diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl index 7ff3583..7f5cdb6 100644 --- a/nginx.conf.tmpl +++ b/nginx.conf.tmpl @@ -23,7 +23,7 @@ http { add_header Referrer-Policy "strict-origin-when-cross-origin"; add_header X-Frame-Options "SAMEORIGIN" always; - root /srv/funkwhale/front/dist; + root /srv/funkwhale/front/dist/; gzip on; gzip_comp_level 5; @@ -71,7 +71,7 @@ http { add_header Content-Security-Policy "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; object-src 'none'; media-src 'self' data:; worker-src 'self'"; add_header Referrer-Policy "strict-origin-when-cross-origin"; add_header Service-Worker-Allowed "/"; - alias /srv/funkwhale/front/dist; + alias /srv/funkwhale/front/dist/; expires 30d; add_header Pragma public; add_header Cache-Control "public, must-revalidate, proxy-revalidate";