Merge branch 'patch-1' into 'develop'

Fix websockets reverse proxy

See merge request funkwhale/funkwhale!773
This commit is contained in:
Eliot Berriot 2019-06-10 09:37:40 +02:00
commit 6810e57c22
1 changed files with 5 additions and 5 deletions

View File

@ -64,11 +64,6 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
Allow from all
</Proxy>
# Activating WebSockets
<Location "/api/v1/activity">
ProxyPass ${funkwhale-api-ws}/api/v1/activity
</Location>
<Location "/">
# similar to nginx 'client_max_body_size 100M;'
LimitRequestBody 104857600
@ -107,6 +102,11 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
</Location>
Alias /staticfiles /srv/funkwhale/data/static
# Activating WebSockets
<Location "/api/v1/activity">
ProxyPass ${funkwhale-api-ws}/api/v1/activity
</Location>
# Setting appropriate access levels to serve frontend
<Directory "/srv/funkwhale/data/static">
Options FollowSymLinks