Commit a75d7e95 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '764-apache' into 'master'

Fix #764: broken sample apache configuration

See merge request !683
parents 039885e6 5c605507
Pipeline #3660 passed with stages
in 4 minutes and 35 seconds
Fixed broken sample apache configuration (#764)
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment