diff --git a/changes/changelog.d/2208.bugfix b/changes/changelog.d/2208.bugfix new file mode 100644 index 000000000..23b64f62f --- /dev/null +++ b/changes/changelog.d/2208.bugfix @@ -0,0 +1 @@ +Fix missing og meta tags (#2208) diff --git a/deploy/docker.proxy.template b/deploy/docker.proxy.template index 06908cbcc..9bd8259e5 100644 --- a/deploy/docker.proxy.template +++ b/deploy/docker.proxy.template @@ -79,6 +79,26 @@ server { + location ~ ^/library/(albums|tracks|artists|playlists)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location /channels/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location ~ ^/@(vite-plugin-pwa|vite|id)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-front; + } + + location /@ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + location / { expires 1d; include /etc/nginx/funkwhale_proxy.conf; diff --git a/deploy/nginx.template b/deploy/nginx.template index 0a5b3ca93..7789f4281 100644 --- a/deploy/nginx.template +++ b/deploy/nginx.template @@ -93,6 +93,26 @@ server { proxy_pass http://funkwhale-api; } + location ~ ^/library/(albums|tracks|artists|playlists)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location /channels/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location ~ ^/@(vite-plugin-pwa|vite|id)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-front; + } + + location /@ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + location / { expires 1d; include /etc/nginx/funkwhale_proxy.conf; diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev index 67a27dd8a..34bca7872 100644 --- a/docker/nginx/conf.dev +++ b/docker/nginx/conf.dev @@ -20,7 +20,6 @@ server { server_name _; - # General configs root /usr/share/nginx/html; client_max_body_size ${NGINX_MAX_BODY_SIZE}; @@ -65,6 +64,26 @@ server { proxy_pass http://funkwhale-api; } + location ~ ^/library/(albums|tracks|artists|playlists)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location /channels/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location ~ ^/@(vite-plugin-pwa|vite|id)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-front; + } + + location /@ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + location / { expires 1d; include /etc/nginx/funkwhale_proxy.conf; diff --git a/front/docker/funkwhale.conf.template b/front/docker/funkwhale.conf.template index 3420a3388..a27024485 100644 --- a/front/docker/funkwhale.conf.template +++ b/front/docker/funkwhale.conf.template @@ -16,7 +16,6 @@ server { server_name _; - # General configs root /usr/share/nginx/html; client_max_body_size ${NGINX_MAX_BODY_SIZE}; @@ -61,6 +60,26 @@ server { proxy_pass http://funkwhale-api; } + location ~ ^/library/(albums|tracks|artists|playlists)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location /channels/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location ~ ^/@(vite-plugin-pwa|vite|id)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-front; + } + + location /@ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + location / { expires 1d; include /etc/nginx/funkwhale_proxy.conf; diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index 936e738fc..dc3cc2f52 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -75,7 +75,6 @@ server { listen [::]:80; server_name _; - {% endif %} # General configs @@ -132,6 +131,26 @@ server { } {% endif %} + location ~ ^/library/(albums|tracks|artists|playlists)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location /channels/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + + location ~ ^/@(vite-plugin-pwa|vite|id)/ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-front; + } + + location /@ { + include /etc/nginx/funkwhale_proxy.conf; + proxy_pass http://funkwhale-api; + } + location / { expires 1d; include /etc/nginx/funkwhale_proxy.conf;