From 031ae27a401dfbd9208419491395736fce35eb4b Mon Sep 17 00:00:00 2001
From: Johan Desmyter <johan@etic.yt>
Date: Mon, 19 Nov 2018 21:54:44 +0300
Subject: [PATCH] fix #617: fix apache proxy for websocket

---
 changes/changelog.d/617.bugfix | 1 +
 deploy/apache.conf             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/617.bugfix

diff --git a/changes/changelog.d/617.bugfix b/changes/changelog.d/617.bugfix
new file mode 100644
index 00000000..c12ad82a
--- /dev/null
+++ b/changes/changelog.d/617.bugfix
@@ -0,0 +1 @@
+Invalid URI for reverse proxy websocket with apache (#617)
diff --git a/deploy/apache.conf b/deploy/apache.conf
index e3a570db..1046615f 100644
--- 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;'
-- 
GitLab