Merge branch 'fix_apache_proxy' into 'develop'

fix #617: fix apache proxy for websocket Closes #617 See merge request funkwhale/funkwhale!472
2018-11-21 19:41:20 +00:00 · 2018-11-21 19:41:20 +00:00 · 1d6a4d8c6f
parent a0bb036c0f 031ae27a40
commit 1d6a4d8c6f
2 changed files with 2 additions and 1 deletions
--- a/changes/changelog.d/617.bugfix
+++ b/changes/changelog.d/617.bugfix
@ -0,0 +1 @@
+Invalid URI for reverse proxy websocket with apache (#617)
--- a/deploy/apache.conf
+++ b/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;'
				`@ -0,0 +1 @@`
				`Invalid URI for reverse proxy websocket with apache (#617)`