From 62cd1df248d59677083f41e179ea8aadd79cf660 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 18:12:46 +0200
Subject: [PATCH] Fix #249: Added missing subsonic configuration block in
 deployment vhost files

---
 changes/changelog.d/249.doc | 26 ++++++++++++++++++++++++++
 deploy/apache.conf          |  6 ++++++
 deploy/nginx.conf           |  6 ++++++
 3 files changed, 38 insertions(+)
 create mode 100644 changes/changelog.d/249.doc

diff --git a/changes/changelog.d/249.doc b/changes/changelog.d/249.doc
new file mode 100644
index 000000000..df0fbb7d1
--- /dev/null
+++ b/changes/changelog.d/249.doc
@@ -0,0 +1,26 @@
+Added missing subsonic configuration block in deployment vhost files (#249)
+
+Missing subsonic configuration bloc in vhost files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Because of a missing bloc in the sample Nginx and Apache configurations,
+instances that were deployed after the 0.13 release are likely to be unable
+to answer to Subsonic clients (the missing bits were properly documented
+in the changelog).
+
+Ensure you have the following snippets in your Nginx or Apache configuration
+if you plan to use the Subsonic API.
+
+Nginx::
+
+    location /rest/ {
+        include /etc/nginx/funkwhale_proxy.conf;
+        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
+    }
+
+Apache2::
+
+    <Location "/rest">
+        ProxyPass ${funkwhale-api}/api/subsonic/rest
+        ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
+     </Location>
diff --git a/deploy/apache.conf b/deploy/apache.conf
index 5bfcbce04..5b74efecd 100644
--- a/deploy/apache.conf
+++ b/deploy/apache.conf
@@ -84,6 +84,12 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
       ProxyPassReverse ${funkwhale-api}/federation
    </Location>
 
+   # You can comment this if you don't plan to use the Subsonic API
+   <Location "/rest">
+      ProxyPass ${funkwhale-api}/api/subsonic/rest
+      ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
+   </Location>
+
    <Location "/.well-known/">
       ProxyPass ${funkwhale-api}/.well-known/
       ProxyPassReverse ${funkwhale-api}/.well-known/
diff --git a/deploy/nginx.conf b/deploy/nginx.conf
index 7d344408b..5314d9017 100644
--- a/deploy/nginx.conf
+++ b/deploy/nginx.conf
@@ -67,6 +67,12 @@ server {
         proxy_pass   http://funkwhale-api/federation/;
     }
 
+    # You can comment this if you do not plan to use the Subsonic API
+    location /rest/ {
+        include /etc/nginx/funkwhale_proxy.conf;
+        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
+    }
+
     location /.well-known/ {
         include /etc/nginx/funkwhale_proxy.conf;
         proxy_pass   http://funkwhale-api/.well-known/;