From 8af6b6ce08788b5c31b5aa9a40458a068f8836cb Mon Sep 17 00:00:00 2001
From: Renon <renon@disroot.org>
Date: Tue, 22 Jan 2019 16:19:25 +0100
Subject: [PATCH] fix apache conf file for 0.18

---
 changes/changelog.d/667.bugfix |  1 +
 deploy/apache.conf             | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 changes/changelog.d/667.bugfix

diff --git a/changes/changelog.d/667.bugfix b/changes/changelog.d/667.bugfix
new file mode 100644
index 000000000..d553867ca
--- /dev/null
+++ b/changes/changelog.d/667.bugfix
@@ -0,0 +1 @@
+Make Apache configuration file work with 0.18 changes (#667)
diff --git a/deploy/apache.conf b/deploy/apache.conf
index f348566a0..764ff6a13 100644
--- a/deploy/apache.conf
+++ b/deploy/apache.conf
@@ -46,10 +46,6 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
    # Tell the api that the client is using https
    RequestHeader set X-Forwarded-Proto "https"
 
-   DocumentRoot /srv/funkwhale/front/dist
-
-   FallbackResource /index.html
-
    # Configure Proxy settings
    # ProxyPreserveHost pass the original Host header to the backend server
    ProxyVia On
@@ -68,15 +64,12 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
       Allow from all
    </Proxy>
 
-   # Activating WebSockets
-   ProxyPass "/api/v1/activity"  ${funkwhale-api-ws}/api/v1/activity
-
-   <Location "/api">
+   <Location "/">
       # similar to nginx 'client_max_body_size 100M;'
       LimitRequestBody 104857600
 
-      ProxyPass ${funkwhale-api}/api
-      ProxyPassReverse ${funkwhale-api}/api
+      ProxyPass ${funkwhale-api}/
+      ProxyPassReverse ${funkwhale-api}/
    </Location>
    <Location "/federation">
       ProxyPass ${funkwhale-api}/federation
@@ -94,8 +87,13 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
       ProxyPassReverse ${funkwhale-api}/.well-known/
    </Location>
 
+   ProxyPass "/front" "!"
+   Alias /front /srv/funkwhale/front/dist
+
+   ProxyPass "/media" "!"
    Alias /media /srv/funkwhale/data/media
 
+   ProxyPass "/staticfiles" "!"
    Alias /staticfiles /srv/funkwhale/data/static
 
    # Setting appropriate access levels to serve frontend