MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(nginx): Remove trailing slash from reverse proxy configuration 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2253>
This commit is contained in:
Georg Krause 2022-12-06 15:29:09 +01:00 committed by Georg Krause
parent 8d818e5fac
commit b55c2549bd
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/2002.bugfix Normal file
View File

@ -0,0 +1 @@
Remove trailing slash from reverse proxy configuration

2
deploy/docker.proxy.template
View File

@ -65,6 +65,6 @@ server {
location / { location / {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
client_max_body_size ${NGINX_MAX_BODY_SIZE}; client_max_body_size ${NGINX_MAX_BODY_SIZE};
proxy_pass http://fw/; proxy_pass http://fw;
} }
} }

6
deploy/nginx.template
View File

@ -87,7 +87,7 @@ server {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
# This is needed if you have file import via upload enabled. # This is needed if you have file import via upload enabled.
client_max_body_size ${NGINX_MAX_BODY_SIZE}; client_max_body_size ${NGINX_MAX_BODY_SIZE};
proxy_pass http://funkwhale-api/; proxy_pass http://funkwhale-api;
} }
location / { location / {
@ -106,7 +106,7 @@ server {
location /federation/ { location /federation/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/federation/; proxy_pass http://funkwhale-api;
} }
# You can comment this if you do not plan to use the Subsonic API. # You can comment this if you do not plan to use the Subsonic API.
@ -117,7 +117,7 @@ server {
location /.well-known/ { location /.well-known/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/.well-known/; proxy_pass http://funkwhale-api;
} }
location /media/ { location /media/ {

10
docker/nginx/conf.dev
View File

@ -80,11 +80,11 @@ http {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
# This is needed if you have file import via upload enabled. # This is needed if you have file import via upload enabled.
client_max_body_size ${NGINX_MAX_BODY_SIZE}; client_max_body_size ${NGINX_MAX_BODY_SIZE};
proxy_pass http://funkwhale-api/api/; proxy_pass http://funkwhale-api;
} }
location / { location / {
proxy_pass http://funkwhale-front/; proxy_pass http://funkwhale-front;
expires 1d; expires 1d;
} }
@ -92,13 +92,13 @@ 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 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"; add_header Referrer-Policy "strict-origin-when-cross-origin";
proxy_pass http://funkwhale-front/embed.html; proxy_pass http://funkwhale-front;
expires 1d; expires 1d;
} }
location /federation/ { location /federation/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/federation/; proxy_pass http://funkwhale-api;
} }
# You can comment this if you do not plan to use the Subsonic API. # You can comment this if you do not plan to use the Subsonic API.
@ -109,7 +109,7 @@ http {
location /.well-known/ { location /.well-known/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/.well-known/; proxy_pass http://funkwhale-api;
} }
location /media/ { location /media/ {

6
front/docker/funkwhale.conf.template
View File

@ -52,7 +52,7 @@ server {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
# This is needed if you have file import via upload enabled. # This is needed if you have file import via upload enabled.
client_max_body_size ${NGINX_MAX_BODY_SIZE}; client_max_body_size ${NGINX_MAX_BODY_SIZE};
proxy_pass http://funkwhale-api/; proxy_pass http://funkwhale-api;
} }
location / { location / {
@ -71,7 +71,7 @@ server {
location /federation/ { location /federation/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/federation/; proxy_pass http://funkwhale-api;
} }
# You can comment this if you do not plan to use the Subsonic API. # You can comment this if you do not plan to use the Subsonic API.
@ -82,7 +82,7 @@ server {
location /.well-known/ { location /.well-known/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/.well-known/; proxy_pass http://funkwhale-api;
} }
location /media/ { location /media/ {