novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Eliot Berriot 2019-03-20 20:45:06 +01:00
commit 9a162c57ca
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
22 changed files with 495 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
deploy/apache.conf
View file

@ -65,7 +65,9 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
</Proxy>
# Activating WebSockets
ProxyPass "/api/v1/activity" ${funkwhale-api-ws}/api/v1/activity
<Location "/api/v1/activity">
ProxyPass ${funkwhale-api-ws}/api/v1/activity
</Location>
<Location "/">
# similar to nginx 'client_max_body_size 100M;'
@ -90,13 +92,19 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
ProxyPassReverse ${funkwhale-api}/.well-known/
</Location>
ProxyPass "/front" "!"
<Location "/front">
ProxyPass "!"
</Location>
Alias /front /srv/funkwhale/front/dist
ProxyPass "/media" "!"
<Location "/media">
ProxyPass "!"
</Location>
Alias /media /srv/funkwhale/data/media
ProxyPass "/staticfiles" "!"
<Location "/staticfiles">
ProxyPass "!"
</Location>
Alias /staticfiles /srv/funkwhale/data/static
# Setting appropriate access levels to serve frontend