Merge branch '764-apache' into 'master'

Fix #764: broken sample apache configuration

See merge request funkwhale/funkwhale!683

changes/changelog.d/764.bugfix

@@ -0,0 +1 @@
+Fixed broken sample apache configuration (#764)

deploy/apache.conf

@@ -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