From 5c605507283176aae9f5a1aa09257ea943ca112a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 20 Mar 2019 20:07:44 +0100
Subject: [PATCH] Fix #764: broken sample apache configuration
---
changes/changelog.d/764.bugfix | 1 +
deploy/apache.conf | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 changes/changelog.d/764.bugfix
diff --git a/changes/changelog.d/764.bugfix b/changes/changelog.d/764.bugfix
new file mode 100644
index 0000000000..114f602b57
--- /dev/null
+++ b/changes/changelog.d/764.bugfix
@@ -0,0 +1 @@
+Fixed broken sample apache configuration (#764)
diff --git a/deploy/apache.conf b/deploy/apache.conf
index 52eee95333..e1409a627d 100644
--- a/deploy/apache.conf
+++ b/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
--
GitLab