Merge branch 'fix_apache_proxy' into 'develop'

fix #617: fix apache proxy for websocket

Closes #617

See merge request funkwhale/funkwhale!472

changes/changelog.d/617.bugfix

+Invalid URI for reverse proxy websocket with apache (#617)

deploy/apache.conf

@@ -69,7 +69,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
    </Proxy>
 
    # Activating WebSockets
-   ProxyPass "/api/v1/instance/activity"  ${funkwhale-api-ws}/api/v1/instance/activity
+   ProxyPass "/api/v1/activity"  ${funkwhale-api-ws}/api/v1/activity
 
    <Location "/api">
       # similar to nginx 'client_max_body_size 30M;'